Merge branch 'collectd-5.2' into collectd-5.3

diff --cc src/common.c
Simple merge

diff --cc src/rrdcached.c
Simple merge

diff --cc src/rrdtool.c
Simple merge