(cherry picked from commit 59a212b6e1265adfa9b55c71b65a22157dfccf77) Conflicts: hadoop-mapreduce-project/CHANGES.txt