YARN-1769. CapacityScheduler: Improve reservations. Contributed by Thomas Graves
(cherry picked from commit 9c22065109a77681bc2534063eabe8692fbcb3cd)
HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee
(cherry picked from commit cf4631d7c9448205f4952341c071e1650e7922dc)
MAPREDUCE-6072. Remove INSTALL document (Akira AJISAKA via aw)
HDFS-6519. Document oiv_legacy command (Akira AJISAKA via aw)
HDFS-4227. Document dfs.namenode.resource.* (Daisuke Kobayashi via aw)
HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota. Contributed by Binglin Chang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1407245 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0f7a4337ac96141db4a3400fd8308436d87042f4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA
(cherry picked from commit 23fbfe36c31674907a26c8ecc6fd47888dfcc1ea)
HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit b3d5d269a73a1826ebf6f637a0dbd69f6261dbcb)
HDFS-7104. Fix and clarify INodeInPath getter functions. Contributed by Zhe Zhang.

(cherry picked from commit f0293f11a85176afc04d809574c9126a80b700cc)
HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang)

(cherry picked from commit a78953c974e52abe73905b1901a2354696f4a5a0)
Move HDFS-7157 to HDFS CHANGES.txt

(cherry picked from commit a45b331cc9b9c772504474c224aa23bcbac403db)
HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang)

(cherry picked from commit 7f0efe96f85704e39349f20ab6a11bfaa81c6a75)
YARN-2606. Application History Server tries to access hdfs before doing secure login (Mit Desai via jeagles)
HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang)

(cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd)
HADOOP-11153. Make number of KMS threads configurable. (wang)

(cherry picked from commit 64aef189656919327b11fe5e90ea680ca7ba83df)
HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li

(cherry picked from commit c88c6c57aa79e8a1f33d2e075491656f472c858b)
HDFS-6779. Add missing version subcommand for hdfs. Contributed by Sasaki Toru.
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2