Merge branch 'collectd-5.4' into collectd-5.5