Merge branch 'collectd-5.7'

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

diff --cc src/curl_json.c
Simple merge

diff --cc src/perl.c
Simple merge