Merge pull request #3280 from mrunge/collectd-5.9