svn merge -c 1501843 Merging from branch-2 to branch-2.1.0-beta to fix HDFS-4887.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1501844 13f79535-47bb-0310-9956-ffa450edef68
YARN-368. Fixed a typo in error message in Auxiliary services. Contributed by Albert Chu.
svn merge --ignore-ancestry -c 1501852 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1501855 13f79535-47bb-0310-9956-ffa450edef68
YARN-295. Fixed a race condition in ResourceManager RMAppAttempt state machine. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1501856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1501858 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4969. WebhdfsFileSystem expects non-standard WEBHDFS Json element. (rkanter via tucu)

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