Merge branch 'collectd-5.7'

diff --cc src/amqp.c
Simple merge

diff --cc src/bind.c
Simple merge

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

diff --cc src/utils_format_graphite.c
Simple merge