Conflicts:
	opennms-base-assembly/pom.xml