(cherry picked from commit 7092d47fc0b3b792dd31f967c01d460dc089f60b) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 7092d47fc0b3b792dd31f967c01d460dc089f60b) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-yarn-project/CHANGES.txt