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