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