Merge branch 'origin/jboss-72'

Conflicts:
	pom.xml
refactor(jboss-subsystem): remove override method

related to CAM-1334
chore(tomcat): Check for CATALINA_BASE too

related to CAM-1401