Fix for NMS-5556 (SNMPV3 context not working in provisiond)
Make context-name, engine-id, and context-engine-id attributes from
SNMP config definitions actually do something. Fix tests that were
confusing engine-id and context-engine-id to distinguish properly.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
NMS-6021 Added SNMP into the resource type label to show NRTG link in the
resource graph page in the WebUI.
Merge branch '1.12'

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpAgentConfig.java
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpConfiguration.java
	opennms-config/src/main/java/org/opennms/netmgt/config/SnmpPeerFactory.java