don't build keystore in assembly, do it as a separate step
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-full-assembly/pom.xml
Merge remote-tracking branch 'origin/1.12'