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