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