HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao.
YARN-2753. Fixed a bunch of bugs in the NodeLabelsManager classes. Contributed by Zhihai xu.

(cherry picked from commit 4cfd5bc7c18bb9a828f573b5c4d2b13fa28e732a)
HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth.

(cherry picked from commit 68db5b3736287ef218acc861368c6b95b72fa2f4)
YARN-2825. Container leak on NM. Contributed by Jian He
(cherry picked from commit c3d475070a1ec54c4b05923f4782cef204effd2c)
YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli
(cherry picked from commit 1e215e8ba2e801eb26f16c307daee756d6b2ca66)
YARN-2819. NPE in ATS Timeline Domains when upgrading from 2.4 to 2.6. Contributed by Zhijie Shen

(cherry picked from commit 4a114dd67aae83e5bb2d65470166de954acf36a2)