a9613bcc94
(cherry picked from commit 4228de94028f1e10ca59ce23e963e488fe566909) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml