Merge "Separate collectd plugin config from configmap"