fix merge breakage (SLF4J not available in 1.12)
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java