Merge branch 'collectd-5.2'

diff --cc configure.in
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/nfs.c
Simple merge

diff --cc src/rrdcached.c
Simple merge