YARN-2778. Moved node-lables' reports to the yarn nodes CLI from the admin CLI. Contributed by Wangda Tan.

(cherry picked from commit b6c1188b855d636586cd8fd0fb6d8e984bbfb0f5)
HDFS-7309. XMLUtils.mangleXmlString doesn't seem to handle less than sign. (Colin Patrick McCabe via raviprak)

(cherry picked from commit c7f81dad30c391822eed7273278cf5885fa59264)
HDFS-7315. DFSTestUtil.readFileBuffer opens extra FSDataInputStream. Contributed by Plamen Jeliazkov.
HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev.
YARN-2186. [YARN-1492] Node Manager uploader service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)

(cherry picked from commit 256697acd5ec16bca022ae86e22f9882b3309d8b)
YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen
(cherry picked from commit 1b4be918664b09272b120bc42de3e5fc02d79047)
HDFS-6917. Add an hdfs debug command to validate blocks, call recoverlease, etc. (cmccabe)

(cherry picked from commit 7b026c50f1be399987d23e06b4ecfbffc51dc7b5)
YARN-2701. Addendum patch. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong
YARN-2789. Re-instated the NodeReport.newInstance private unstable API modified in YARN-2698 so that tests in YARN frameworks don't break. Contributed by Wangda Tan.

(cherry picked from commit 6ce32f593bff6788084ce9bc1e11ade74ed3dbaf)
YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov
(cherry picked from commit 7bc179f9f5e1e270fd5e6f1ad29b0f32fe371d15)
YARN-2711. Fixed TestDefaultContainerExecutor#testContainerLaunchError failure on Windows. Contributed by Varun Vasudev.

(cherry picked from commit 1cd088fd9dac3015df0b6281974fc6b6c3ece20d)
HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. Contributed by Varun Vasudev.

(cherry picked from commit 260ab6d5f462d0fe1a4312cbba1c098141e3870e)
MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du.

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