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