MAPREDUCE-6156. Fetcher - connect() doesn't handle connection refused correctly. Contributed by Junping Du
(cherry picked from commit 177e8090f5809beb3ebcb656cd0affbb3f487de8)
YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user kill request races with ApplicationMaster finish. Contributed by Jian He.

(cherry picked from commit 3651fe1b089851b38be351c00a9899817166bf3e)
YARN-2846. Incorrect persist exit code for running containers in reacquireContainer() that interrupted by NodeManager restart. Contributed by Junping Du
(cherry picked from commit 33ea5ae92b9dd3abace104903d9a94d17dd75af5)
YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)
YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit 81dc0ac6dcf2f34ad607da815ea0144f178691a9)
HDFS-7358. Clients may get stuck waiting when using ByteArrayManager.
HDFS-7385. ThreadLocal used in FSEditLog class causes FSImage permission mess up. Contributed by jiangyu.

(cherry picked from commit b0a41de68c5b08f534ca231293de053c0b0cbd5d)
Preparing to release hadoop-2.6.0-rc1.

(cherry picked from commit 9ff7315cbe9804bebcd1ec093fac7828a72ddf59)
Revert "YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw)"

This reverts commit b0a9cd37ab9ef45ed9a71b04f1634fa54dd4c438.

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 4ae9780e6a05bfd6b93f1c871c22761ddd8b19cb)
YARN-2766. Made ApplicationHistoryManager return a sorted list of apps, attempts and containers. Contributed by Robert Kanter.

(cherry picked from commit 3648cb57c9f018a3a339c26f5a0ca2779485521a)
HDFS-7395. BlockIdManager#clear() bails out when resetting the GenerationStampV1Limit. Contributed by Haohui Mai.
YARN-2856. Fixed RMAppImpl to handle ATTEMPT_KILLED event at ACCEPTED state on app recovery. Contributed by Rohith Sharmaks
(cherry picked from commit d005404ef7211fe96ce1801ed267a249568540fd)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2