(cherry picked from commit 658b1a6cde6834be41de8745684b9c40f8b9c12c) Conflicts: .gitignore
@@ -51,6 +51,7 @@ patchprocess/
.history/
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package-lock.json
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn-error.log
+phantomjsdriver.log
#robotframework outputs
log.html