anticipate some new events
Merge branch '1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java