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