YARN-2780. Log aggregated resource allocation in rm-appsummary.log. Contributed by Eric Payne
(cherry picked from commit f8aefa5e9c8c6d2817205b5ed8d914db31f56ae7)
YARN-2236. [YARN-1492] Shared Cache uploader service on the Node Manager. (Chris Trezzo and Sanjin Lee via kasha)

(cherry picked from commit a04143039e7fe310d807f40584633096181cfada)
HADOOP-9576. Merging to branch-2.6 for hadoop-2.6.0-rc1.
YARN-2841. Merging to branch-2.6 for hadoop-2.6.0-rc1.
YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.
YARN-2794. Fixed log messages about distributing system-credentials. Contributed by Jian He.

(cherry picked from commit be7bf956e96dd0fd9b521ca71df9124b9cc5ebd0)
HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.
YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw)
HADOOP-11217. (Addendum to allow SSLv2Hello) Disable SSLv3 in KMS. (Robert Kanter via kasha)

(cherry picked from commit 87818ef4e7c1a49dc3b0d6766cceb3499b07b837)
HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter.

(cherry picked from commit 9f0319bba1788e4c579ce533b14c0deab63f28ee)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
HDFS-6938. Cleanup javac warnings in FSNamesystem. Contributed by Charles Lamb.
Fix CHANGES.txt to keep it consistent with trunk.
HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA.
HADOOP-11291. Log the cause of SASL connection failures. Contributed by Stephen Chu.

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