(cherry picked from commit 6099deebcb0ea23adc0f0c62db749c8f528869e9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java
(cherry picked from commit 6099deebcb0ea23adc0f0c62db749c8f528869e9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java