Conflicts: addons/hive-bridge/src/site/twiki/Bridge-Hive.twiki webapp/pom.xml webapp/src/test/java/org/apache/hadoop/metadata/web/listeners/LoginProcessorIT.java
