Merge branch 'collectd-4.9' into collectd-4.10

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

diff --cc src/configfile.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/plugin.c
Simple merge

diff --cc src/utils_match.c
Simple merge

diff --cc src/utils_match.h
Simple merge