Merge branch 'collectd-4.7'

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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

diff --cc src/common.c
Simple merge

diff --cc src/dns.c
Simple merge

diff --cc src/gmond.c
Simple merge

diff --cc src/java.c
Simple merge

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

diff --cc src/utils_cache.c
Simple merge