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