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