Review for SAMZA-289

[Chris Riccomini]

Hey guys,

Could I get a review on https://issues.apache.org/jira/browse/SAMZA-289? Should 
be pretty straight forward.

Thanks!
Chris