HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha)
HDFS-6534. Fix build on macosx: HDFS parts (Binglin Chang via aw)
YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw)
MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai
HDFS-7081. Add new DistributedFileSystem API for getting all the existing storage policies. Contributed by Jing Zhao.
YARN-2102. Added the concept of a Timeline Domain to handle read/write ACLs on Timeline service event data. Contributed by Zhijie Shen.
Move HDFS-6987 from trunk to branch-2 in CHANGES.txt
YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha)
HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth.
HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw)
HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang)
Add branch-2 only commit HDFS-7138 to CHANGES.txt
YARN-2581. Passed LogAggregationContext to NM via ContainerTokenIdentifier. Contributed by Xuan Gong.
YARN-2546. Made REST API for application creation/submission use numeric and boolean types instead of the string of them. Contributed by Varun Vasudev.
HDFS-7140. Add a tool to list all the existing block storage policies. Contributed by Jing Zhao.
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java