Merging in work from puppet-module-collectd