Master

code review at 
https://review.cloudera.org/r/4533/