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
Fix units in HP-UX swap and physMem graph definitions
Fixing invalid placeholder on opennms.service
Revert "Fixing invalid placeholder on opennms.service"

This reverts commit 7d90864519117353cae96716911d3b8cb943d60f.
Fixing invalid placeholder on opennms.service
Removing alarm-data from hardware inventory events.

The idea of having the hardware events is to trigger third-party
integration everytime the inventory is updated.

There is no need to generate alarms from these events.
[bamboo] Automated branch merge (from 1.12:e3cff4d36382bac58d896f1bd8c37c5adc2e183a)
Merge pull request #127 from OpenNMS/jira/NMS-6860-1.14

jira/NMS-6860 for OpenNMS 1.14
more rearranging/cleanup for karaf support
Merge remote-tracking branch 'origin/rc/stable/1.14.0' into features/karaf-2.4.0