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