Collectd and Capsd config feature.
Merge branch 'working'
Merge branch 'master' of https://github.com/savoirtech/opennms-ng
Conflict merge