MAPREDUCE-5442. Merging change r1529079 from branch-2 to branch-2.1-beta

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1529081 13f79535-47bb-0310-9956-ffa450edef68
YARN-1219. Merging change r1529085 from branch-2 to branch-2.1-beta

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