Merge branch 'collectd-5.5' into collectd-5.6

diff --cc src/apache.c
Simple merge

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

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

diff --cc src/curl_json.c
Simple merge