MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov
(cherry picked from commit 10f9f5101c44be7c675a44ded4aad212627ecdee)
YARN-2818. Removed the now unnecessary user entity injection from Timeline service given we now have domains. Contributed by Zhijie Shen.

(cherry picked from commit f5b19bed7d71979dc8685b03152188902b6e45e9)
YARN-2768 Improved Yarn Registry service record structure (stevel)
HDFS-7365. Remove hdfs.server.blockmanagement.MutableBlockCollection. Contributed by Li Lu.
MAPREDUCE-5958. Wrong reduce task progress if map output is compressed. Contributed by Emilio Coppa and Jason Lowe.
(cherry picked from commit 8f701ae07a0b1dc70b8e1eb8d4a5c35c0a1e76da)
HADOOP-11274. ConcurrentModificationException in Configuration Copy Constructor. Contributed by Junping Du.
YARN-2744. Fixed CapacityScheduler to validate node-labels correctly against queues. Contributed by Wangda Tan.

(cherry picked from commit a3839a9fbfb8eec396b9bf85472d25e0ffc3aab2)
HDFS-7364. Balancer always shows zero Bytes Already Moved. Contributed by Tsz Wo Nicholas Sze.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
Revert "HADOOP-11274. ConcurrentModificationException in Configuration Copy Constructor. Contributed by Junping Du."

This reverts commit 16b34824673f5a50d464727b8fad98470e5e984a.
YARN-2647. Added a queue CLI for getting queue information. Contributed by Sunil Govind.

(cherry picked from commit 61effcbebc819ee1bd3d60f5444c39c972494a32)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/bin/yarn
HDFS-7221. Update CHANGES.txt to indicate fix in 2.6.0.

(cherry picked from commit e7f1c0482e5dff8a1549ace1fc2b366941170c58)
HDFS-7226. Update CHANGES.txt to indicate fix in 2.6.0.

(cherry picked from commit d026f3676278e24d7032dced5f14b52dec70b987)
HADOOP-11280. TestWinUtils#testChmod fails after removal of NO_PROPAGATE_INHERIT_ACE. Contributed by Chris Nauroth.

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