Merge branch 'collectd-5.5'

diff --cc src/bind.c
Simple merge

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

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

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/python.c
Simple merge