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