Merge branch 'collectd-4.4' of git://git.verplant.org/collectd into collectd-4.4