Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9