YARN-2907. SchedulerNode#toString should print all resource detail instead of only memory. (Contributed by Rohith)
(cherry picked from commit c732ed760e115192652280cd4b5799d49e62db7e)
HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe)
(cherry picked from commit 86e3993def01223f92b8d1dd35f6c1f8ab6033f5)
MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena
(cherry picked from commit 2b30fb1053e70c128b98013fb63cf9a095623be6)
YARN-2905. AggregatedLogsBlock page can infinitely loop if the aggregated log file is corrupted. Contributed by Varun Saxena
(cherry picked from commit 0f9528b99addbb0fd9a19d84db22a8c8e934b05f)
MAPREDUCE-6160. Potential NullPointerException in MRClientProtocol interface implementation. Contributed by Rohith
(cherry picked from commit 0c588904f8b68cad219d2bd8e33081d5cae656e5)
YARN-2765. Added leveldb-based implementation for RMStateStore. Contributed by Jason Lowe
(cherry picked from commit a7fba0bc28764e0fb36c335ea60cc58079fe007f)
YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai.

(cherry picked from commit 51af8d367de94689770f57c64bea3b244d7755f6)
HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done atomically. Contributed by Dian Fu.

(cherry picked from commit 9fa29902575ac3774bf3728e7bcde7f3eefb1d4c)
HDFS-7450. Consolidate the implementation of GetFileInfo(), GetListings() and GetContentSummary() into a single class. Contributed by Haohui Mai.
HDFS-7438. Consolidate the implementation of rename() into a single class. Contributed by Haohui Mai.
CHANGES.txt: add HADOOP-11257

(cherry picked from commit c1f2bb2d31d40bda5bb2c5bdf31e4f6e433d1e77)
HADOOP-11341. KMS support for whitelist key ACLs. Contributed by Arun Suresh.

(cherry picked from commit 31b4d2daa14a7f6e8ee73fd3160e126d8db62ffb)
HBASE-11301 [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack)

(cherry picked from commit 74f4d8590de85eaa92c711010bbc0ff0e33ee2e8)
Revert "HBASE-11301 [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack)"

This reverts commit fd6a801ddb2d2db83f98e7aab183a6e07ce4890c.

Refers to an HBASE rather than HADOOP issue.
HADOOP-11301. [optionally] update jmx cache to drop old metrics  (Maysam Yabandeh via stack)

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