YARN-2179. [YARN-1492] Initial cache manager structure and context. (Chris Trezzo via kasha)
HDFS-6754. TestNamenodeCapacityReport.testXceiverCount may sometimes fail due to lack of retry. Contributed by Mit Desai.
Merge branch 'trunk' into HDFS-6581
HDFS-6581. Update CHANGES.txt in preparation for trunk merge