Trivial fix for minor refactor error for YARN-521

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503924 13f79535-47bb-0310-9956-ffa450edef68
Merge r1503935 from branch-2 to branch-2.1-beta for YARN-513. Create common proxy client for communicating with RM (Xuan Gong & Jian He via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503939 13f79535-47bb-0310-9956-ffa450edef68
Merge r1503936 from branch-2 to branch-2.1-beta for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503941 13f79535-47bb-0310-9956-ffa450edef68
YARN-661. Fixed NM to cleanup users' local directories correctly when starting up. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1503942 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503944 13f79535-47bb-0310-9956-ffa450edef68
YARN-820. Fixed an invalid state transition in NodeManager caused by failing resource localization. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1503947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503949 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1503952 merging to branch-2.1-beta to fix HDFS-4687.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503953 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe


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