collectd: switch resource definitions to what our new module expects.
Merge pull request #69 from mfournier/apache-split-collectd

collectd: switch resource definitions to what our new module expects.