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