SAMZA-147 Review

[Chris Riccomini]

Hey Guys,

I've had a (fairly large) diff up for 2 days:

  https://reviews.apache.org/r/18222/
  https://issues.apache.org/jira/browse/SAMZA-147

Any chance I could get a review from someone?

Cheers,
Chris