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