(cherry picked from commit 9ccf935b2cba5ac8a3e8124360d2203931397391) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
(cherry picked from commit 9ccf935b2cba5ac8a3e8124360d2203931397391) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java