merge -r merge -r 1428780:1428781 Merging YARN-286 to branch-0.23

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1440092 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1430928:1430929 Merging MAPREDUCE-1700 to branch-0.23

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