YARN-1156. Enhance NodeManager AllocatedGB and AvailableGB metrics for aggregation of decimal values. (Contributed by Tsuyoshi OZAWA)
(cherry picked from commit e65b7c5ff6b0c013e510e750fe5cf59acfefea5f)
HDFS-7448 TestBookKeeperHACheckpoints fails in trunk (Akira Ajisaka via stevel)
MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov
(cherry picked from commit 03ab24aa01ffea1cacf1fa9cbbf73c3f2904d981)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
HADOOP-11342. KMS key ACL should ignore ALL operation for default key ACL and whitelist key ACL. Contributed by Dian Fu.

(cherry picked from commit 1812241ee10c0a98844bffb9341f770d54655f52)
HDFS-7458. Add description to the nfs ports in core-site.xml used by nfs test to avoid confusion. Contributed by Yongjun Zhang

(cherry picked from commit a1e822595c3dc5eadbd5430e57bc4691d09d5e68)
YARN-2874. Dead lock in DelegationTokenRenewer which blocks RM to execute any further apps. (Naganarasimha G R via kasha)
(cherry picked from commit 799353e2c7db5af6e40e3521439b5c8a3c5c6a51)
YARN-2891. Failed Container Executor does not provide a clear error message. Contributed by Dustin Cote. (harsh)

(cherry picked from commit 4b13318dea7a1cbbbfc1f84207af829cbe2f720e)
YARN-2880. Added a test to make sure node labels will be recovered if RM restart is enabled. Contributed by Rohith Sharmaks
(cherry picked from commit 73fbb3c66b0d90abee49c766ee9d2f05517cb9de)
HADOOP-11332. KerberosAuthenticator#doSpnegoSequence should check if kerberos TGT is available in the subject. Contributed by Dian Fu.
(cherry picked from commit 9d1a8f5897d585bec96de32116fbd2118f8e0f95)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2