(cherry picked from commit 17d1202c35) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn
17d1202c35