(cherry picked from commit c0aeb666a4d43aac196569d9ec6768d62139d2b9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
(cherry picked from commit c0aeb666a4d43aac196569d9ec6768d62139d2b9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml