Merge branch 'collectd-5.3'

Conflicts:
	src/collectd.conf.pod

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

diff --cc src/common.c
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/types.db
Simple merge

diff --cc src/varnish.c
Simple merge

diff --cc src/write_riemann.c
Simple merge