Merge pull request #3318 from mrunge/collectd-5.10