Merge branch 'collectd-5.5'

diff --cc configure.ac
Simple merge

diff --cc src/bind.c
Simple merge

diff --cc src/curl_xml.c
Simple merge

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

diff --cc src/libcollectdclient/client.c
Simple merge

diff --cc src/madwifi.c
Simple merge

diff --cc src/statsd.c
Simple merge

diff --cc src/unixsock.c
Simple merge

diff --cc src/varnish.c
Simple merge

diff --cc src/write_riemann.c
Simple merge

diff --cc src/write_sensu.c
Simple merge

diff --cc src/write_tsdb.c
Simple merge

diff --cc src/zfs_arc.c
Simple merge

diff --cc src/zookeeper.c
Simple merge