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