(cherry picked from commit 61effcbebc819ee1bd3d60f5444c39c972494a32) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn (cherry picked from commit b1521c7c3ce7dfaabdb3fc1d74c10970dda57fe5)
(cherry picked from commit 61effcbebc819ee1bd3d60f5444c39c972494a32) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn (cherry picked from commit b1521c7c3ce7dfaabdb3fc1d74c10970dda57fe5)