Merge branch 'collectd-5.4' into collectd-5.5

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/amqp.c
Simple merge

diff --cc src/bind.c
Simple merge

diff --cc src/cpu.c
Simple merge

diff --cc src/csv.c
Simple merge

diff --cc src/filecount.c
Simple merge

diff --cc src/modbus.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/powerdns.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/write_graphite.c
Simple merge