NMS-6860: Fix toProtocolConfiguration() and parseProtocolConfiguration() in SnmpAgentConfig. This enabled NRTG to work with SNMP v3
NMS-6860: Fix merge conflict from jira/NMS-6860-1.12 into origin/jira/NMS-6860-1.14
Merge pull request #127 from OpenNMS/jira/NMS-6860-1.14

jira/NMS-6860 for OpenNMS 1.14
Add a delay for calling System.exit(1) otherwise a Connection Reset error occurs
Merge branch 'jira/NMS-6857' into rc/stable/1.14.0
[bamboo] Automated branch merge (from rc/stable/1.14.0:26e424bf3e483dd72bf66d677507e27941d6c4d3)