Merge pull request #3010 from rpv-tomsk/collectd-5.8