YARN-1349. Merging change r1536445 from branch-2 to branch-2.2

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

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