HDFS-5102. Merge change r1514802 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514803 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5105. Merging change r1514872 from branch-2 to branch-2.1-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514873 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9880. Merge change r1514915 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514916 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5106. Merging change r1514914 from branch-2 to branch-2.1-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514917 13f79535-47bb-0310-9956-ffa450edef68
YARN-107. Fixed ResourceManager and clients to better handle forceKillApplication on non-running and finished applications. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1514918 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514920 13f79535-47bb-0310-9956-ffa450edef68