HADOOP-9429. Merging change 1464725 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464728 13f79535-47bb-0310-9956-ffa450edef68
Updated CHANGES.txt to reflect YARN-470 being merged into branch-2.0.4-alpha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464773 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-HADOOP-9315-branch-2-gd