Merge branch 'collectd-5.7'

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/utils_cmd_flush.c
Simple merge

diff --cc src/utils_cmd_flush.h
Simple merge