YARN-2668 yarn-registry JAR won't link against ZK 3.4.5. (stevel)
MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha)

(cherry picked from commit ed0e0ef9748ce5b231de677ab41c3035137bbde4)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2