Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1