Merge pull request #3202 from mrunge/collectd-5.9