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