Auto-Merge pull request #2736 from rpv-tomsk/collectd-collectd-5.8