Merge pull request #1736 from hnyman/conf-collectd