YARN-1349. Merging change r1536443 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536445 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5413. Merging change r1536448 from trunk to branch-2.

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