Merge branch 'collectd-5.4' into collectd-5.5

diff --cc configure.ac
Simple merge

diff --cc src/dns.c
Simple merge

diff --cc src/exec.c
index 8d737ce,0445b14..f080ad6
mode 100644,100755..100755
--- 1/src/exec.c
--- 2/src/exec.c
+++ b/src/exec.c

diff --cc src/liboconfig/scanner.l
Simple merge

diff --cc src/pf.c
Simple merge

diff --cc src/utils_vl_lookup.c
Simple merge