fix init clobbering the already-initialized peer factory
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/SnmpPeerFactory.java
Merge remote-tracking branch 'origin/master' into pjsm/2.0