YARN-2823. Fixed ResourceManager app-attempt state machine to inform schedulers about previous finished attempts of a running appliation to avoid expectation mismatch w.r.t transferred containers. Contributed by Jian He.

(cherry picked from commit a5657182a7accebe08cd86e46b4cdeb163d4d1f2)
YARN-2810. TestRMProxyUsersConf fails on Windows VMs. Contributed by Varun Vasudev

(cherry picked from commit 1e97f2f09464e871773188f642f3a01b744c580f)
YARN-2824. Fixed Capacity Scheduler to not crash when some node-labels are not mapped to queues by making default capacities per label to be zero. Contributed by Wangda Tan.

(cherry picked from commit 2ac1be7dec4aef001e3162e364249933b2c4a6c4)
YARN-2827. Fixed bugs in "yarn queue" CLI. Contributed by Wangda Tan.
YARN-2803. MR distributed cache not working correctly on Windows after NodeManager privileged account changes. Contributed by Craig Welch.

(cherry picked from commit 06b797947c980d7d21864eb8b700cf565756aac1)
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)
YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826. Contributed by Wangda Tan.

(cherry picked from commit df36edf751202db00d8f43103d7120ec56d70a04)
YARN-2505. Supported get/add/remove/change labels in RM REST API. Contributed by Craig Welch.

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