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