Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/collectd.conf.in
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/email.c
Simple merge

diff --cc src/libcollectdclient/network.c
Simple merge

diff --cc src/openvpn.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/snmp.c
Simple merge