Conflicts:
	pom.xml
	src/bin/cputil.sh
	webapp/pom.xml
	webapp/src/main/java/org/apache/hadoop/metadata/web/service/SecureEmbeddedServer.java
	webapp/src/test/java/org/apache/hadoop/metadata/CredentialProviderUtilityIT.java
	webapp/src/test/java/org/apache/hadoop/metadata/web/resources/BaseResourceIT.java
	webapp/src/test/java/org/apache/hadoop/metadata/web/service/SecureEmbeddedServerIT.java