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