Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4