YARN-2927. [YARN-1492] InMemorySCMStore properties are inconsistent. (Ray Chiang via kasha)
MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh)
HADOOP-10530 Make hadoop build on Java7+ only (stevel)
HDFS-7384. getfacl command and getAclStatus output should be in sync. Contributed by Vinayakumar B.
HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0 is invalid. Contributed by Akira AJISAKA.
Merge branch 'apache-trunk' into HADOOP-11321