YARN-2692 ktutil test hanging on some machines/ktutil versions (stevel)
HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang.
MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
YARN-2700 TestSecureRMRegistryOperations failing on windows: auth problems
HDFS-7254. Add documentation for hot swaping DataNode drives (Lei Xu via Colin P. McCabe)
(cherry picked from commit 66e8187ea1dbc6230ab2c633e4f609a7068b75db)
HDFS-6877. Avoid calling checkDisk when an HDFS volume is removed during a write. (Lei Xu via Colin P. McCabe)
(cherry picked from commit 7b0f9bb2583cd9b7274f1e31c173c1c6a7ce467b)
HADOOP-10748. HttpServer2 should not load JspServlet. Contributed by Haohui Mai.
HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. (Arun Suresh via kasha)
(cherry picked from commit 70719e5c62f32836914bea88e1ddd99c0ed009e1)
HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks.  Contributed by Uma Maheswara Rao G

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

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
HDFS-6824. Additional user documentation for HDFS encryption.

(cherry picked from commit a36399e09c8c92911df08f78a4b88528b6dd513f)
YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu
(cherry picked from commit 3b12fd6cfbf4cc91ef8e8616c7aafa9de006cde5)
HDFS-7277. Remove explicit dependency on netty 3.2 in BKJournal. Contributed by Haohui Mai.
YARN-2732. Fixed syntax error in SecureContainer.apt.vm. Contributed by Jian He.

(cherry picked from commit b94b8b30f282563ee2ecdd25761b2345aaf06c9b)
HDFS-7180. NFSv3 gateway frequently gets stuck due to GC. Contributed by Brandon Li

(cherry picked from commit d71d40a63d198991077d5babd70be5e9787a53f1)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2