Clean up collectd to use new servcies-bundle