Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0