cc6ae6fa7e
(cherry picked from commit 27d24f96ab8d17e839a1ef0d7076efc78d28724a) (cherry picked from commit b826168173c3386738acc12a5d62577f12aa06e9) Conflicts: hadoop-mapreduce-project/CHANGES.txt