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