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