Merge branch 'uni/collectd-4.0' into collectd-4.0