Merge pull request #3321 from ccin2p3/collectd-5.10