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