Review SAMZA-512

[Chris Riccomini]

Hey all,

Could I get a review for:

  https://issues.apache.org/jira/browse/SAMZA-512

Thanks!
Chris