Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9