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