(cherry picked from commit c01d15ab2731b6710c94ff3bfa37d496a87b0c9f) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java
(cherry picked from commit c01d15ab2731b6710c94ff3bfa37d496a87b0c9f) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java