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