HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java. Contributed by Abhiraj Butala. (harsh)
HDFS-6538. Comment format error in ShortCircuitRegistry javadoc. Contributed by David Luo. (harsh)
HDFS-7278. Add a command that allows sysadmins to manually trigger full block reports from a DN (cmccabe)
(cherry picked from commit baf794dc404ac54f4e8332654eadfac1bebacb8f)
YARN-2726. CapacityScheduler should explicitly log when an accessible label has no capacity. Contributed by Wangda Tan
YARN-2591. Fixed AHSWebServices to return FORBIDDEN(403) if the request user doesn't have access to the history data. Contributed by Zhijie Shen
(cherry picked from commit c05b581a5522eed499d3ba16af9fa6dc694563f6)
HDFS-7296. HdfsConstants#MEMORY_STORAGE_POLICY_ID and HdfsConstants#MEMORY_STORAGE_POLICY_ID are missing in branch-2. Contributed by Jing Zhao.
HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth.

(cherry picked from commit 463aec11718e47d4aabb86a7a539cb973460aae6)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
HDFS-6934. Revert files accidentally committed.

(cherry picked from commit 5b1dfe78b8b06335bed0bcb83f12bb936d4c021b)
YARN-2704. Changed ResourceManager to optionally obtain tokens itself for the sake of localization and log-aggregation for long-running services. Contributed by Jian He.

(cherry picked from commit a16d022ca4313a41425c8e97841c841a2d6f2f54)
HDFS-5928. Show namespace and namenode ID on NN dfshealth page. Contributed by Siqi Li.
HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC (Jinghui Wang via Colin P. McCabe)
(cherry picked from commit 518a7f4af3d8deeecabfa0629b16521ce09de459)
YARN-2502. Changed DistributedShell to support node labels. Contributed by Wangda Tan
(cherry picked from commit f6b963fdfc517429149165e4bb6fb947be6e3c99)
MAPREDUCE-5933. Enabled MR AM to post history events to the timeline server. Contributed by Robert Kanter.

(cherry picked from commit 6b2f11b54bc679b0715fe66bd129e340e8c61c5c)
MAPREDUCE-6018. Added an MR specific config to enable emitting job history data to the timeline server. Contributed by Robert Kanter.

(cherry picked from commit 971e91c8c03a23e4613ed3f071b4f982ee5a1b63)
HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu)
HDFS-6741. Improve permission denied message when FSPermissionChecker#checkOwner fails. Contributed by Stephen Chu and Harsh J. (harsh)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2