refactor snmp peer factory more, fix a deadlock in the access service
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/pom.xml
	opennms-config/src/main/java/org/opennms/netmgt/config/SnmpConfigAccessService.java
	opennms-config/src/main/java/org/opennms/netmgt/config/SnmpPeerFactory.java
	opennms-config/src/test/java/org/opennms/netmgt/config/ConfigureSnmpTest.java
	opennms-webapp/src/main/java/org/opennms/web/rest/OnmsRestService.java
fix typo in migrator filename
Merge remote-tracking branch 'origin/1.12'
change to a scheduled executor to make sure writes persist if reads do not occur
Merge remote-tracking branch 'origin/1.12'
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 branch 'master' of https://github.com/OpenNMS/OpenNMS into cyr-events-Dell-p2