HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is required on Mac. Contributed by Chris Nauroth.

(cherry picked from commit 8dc4e9408f4cd9a50cd58aee574f3b03c3a33b31)
HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA.

(cherry picked from commit b9158697a4f2d345b681a9b6ed982dae558338bc)
Preparing to branch hadoop-2.6
HDFS-7167. NPE while running Mover if the given path is for a file. Contributed by Jing Zhao.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
YARN-2610. Hamlet should close table tags. (Ray Chiang via kasha)

(cherry picked from commit f7743dd07dfbe0dde9be71acfaba16ded52adba7)
YARN-2627. Added the info logs of attemptFailuresValidityInterval and number of previous failed attempts. Contributed by Xuan Gong.

(cherry picked from commit 9582a50176800433ad3fa8829a50c28b859812a3)
YARN-2387. Resource Manager crashes with NPE due to lack of synchronization. Contributed by Mit Desai
(cherry picked from commit feaf139b4f327d33011e5a4424c06fb44c630955)
YARN-2594. Potential deadlock in RM when querying ApplicationResourceUsageReport. (Wangda Tan via kasha)

(cherry picked from commit 14d60dadc25b044a2887bf912ba5872367f2dffb)
HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). Contributed by Zhihai Xu.

(cherry picked from commit d7075ada5d3019a8c520d34bfddb0cd73a449343)
YARN-2602. Fixed possible NPE in ApplicationHistoryManagerOnTimelineStore. Contributed by Zhijie Shen
(cherry picked from commit bbff96be48119774688981d04baf444639135977)
HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang)

(cherry picked from commit e25a25c5343c889d8c9e45b65082ddb55cf36d52)
HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel)
HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal)
YARN-2179. [YARN-1492] Initial cache manager structure and context. (Chris Trezzo via kasha)

(cherry picked from commit 17d1202c35a1992eab66ea05dfd2baf219a17aec)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/bin/yarn
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2