Merge branch 'collectd-4' into ff/unixsock