Merge pull request #1830 from rubenk/move-collectd-header