MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh)

(cherry picked from commit 8963515b880b78068791f11abe4f5df332553be1)
HADOOP-10530 Make hadoop build on Java7+ only (stevel)
HDFS-7384. getfacl command and getAclStatus output should be in sync. Contributed by Vinayakumar B.

(cherry picked from commit ffe942b82c1208bc7b22899da3a233944cb5ab52)
HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0 is invalid. Contributed by Akira AJISAKA.

(cherry picked from commit d555bb2120cb44d094546e6b6560926561876c10)
HADOOP-11354. ThrottledInputStream doesn't perform effective throttling. Contributed by Ted Yu.
HDFS-7486. Consolidate XAttr-related implementation into a single class. Contributed by Haohui Mai.
HADOOP-11329. Add JAVA_LIBRARY_PATH to KMS startup options. Contributed by Arun Suresh.

(cherry picked from commit ddffcd8fac8af0ff78e63cca583af5c77a062891)
HADOOP-11287. Simplify UGI#reloginFromKeytab for Java 7+. Contributed by Li Lu.
YARN-2931. PublicLocalizer may fail until directory is initialized by LocalizeRunner. (Anubhav Dhoot via kasha)
(cherry picked from commit db73cc9124bb8511c1626ba40d3fad81e980e44f)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2