Review SAMZA-544

[Chris Riccomini]

Hey all,

Could I get a review for:

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

Thanks.

Cheers,
Chris