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