Merge branch 'collectd-4.4' into collectd-4.5