Merge branch 'collectd-4.7'

Conflicts:
	src/network.c

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

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

diff --cc src/java.c
Simple merge

diff --cc src/meta_data.c
Simple merge

diff --cc src/plugin.c
Simple merge

diff --cc src/utils_cache.c
Simple merge