Merge branch 'collectd-5.6' into collectd-5.7

diff --cc src/daemon/collectd.c
Simple merge

diff --cc src/log_logstash.c
Simple merge

diff --cc src/logfile.c
Simple merge