YARN-90. NodeManager should identify failed disks becoming good again. Contributed by Varun Vasudev
(cherry picked from commit 6f2028bd1514d90b831f889fd0ee7f2ba5c15000)
HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li
HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li

(cherry picked from commit 4e134a02a4b6f30704b99dfb166dc361daf426ea)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch.

(cherry picked from commit 6637e3cf95b3a9be8d6b9cd66bc849a0607e8ed5)
HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb.

(cherry picked from commit ac56b0637e55465d3b7f7719c8689bff2a572dc0)
YARN-2709. Made timeline client getDelegationToken API retry if ConnectException happens. Contributed by Li Lu.

(cherry picked from commit b2942762d7f76d510ece5621c71116346a6b12f6)
YARN-2715. Fixed ResourceManager to respect common configurations for proxy users/groups beyond just the YARN level config. Contributed by Zhijie Shen.

(cherry picked from commit c0e034336c85296be6f549d88d137fb2b2b79a15)
YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. Contributed by Jian He.

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