Merge branch 'collectd-5.5'

diff --cc src/apache.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
Simple merge

diff --cc src/java.c
Simple merge

diff --cc src/snmp.c
Simple merge