Fixed Adpatermanager logging
Merge branch '1.12' into 1.14.0

Conflicts:
	integrations/opennms-rancid-provisioning-adapter/src/main/java/org/opennms/netmgt/config/RancidAdapterConfigManager.java