Merge branch 'collectd-4.10' into collectd-5.1

No match.