Auto-Merge pull request #2522 from mfournier/fix-collectd-5.8-build