(cherry picked from commit 78968155d7f87f2147faf96c5eef9c23dba38db8) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn