Merged
Removed old collectd-config