5b3d9bf636
(cherry picked from commit 241336ca2b7cf97d7e0bd84dbe0542b72f304dc9) Conflicts: hadoop-mapreduce-project/CHANGES.txt