Merge branch 'collectd-5.6' into collectd-5.7

diff --cc src/dbi.c
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/exec.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/unixsock.c
Simple merge