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