Merge branch 'collectd-5.5' into collectd-5.6