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