(cherry picked from commit 863079bb874ba77918ca1c0741eae10e245995c8) (cherry picked from commit 53aa3a4d1f2e02ab60fd8b4485286b57df5fcdf9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java