move this back to org.opennms.netmgt.collectd for config-compatibility reasons, since we have not finished the OSGi move anyways
Merge remote-tracking branch 'opennms/1.12'