df4e1e4965
(cherry picked from commit 2ac87df578accb6e612f70ded76271cb5082ee10) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml