Merge branch 'collectd-5.5'

diff --cc src/curl_json.c
Simple merge

diff --cc src/modbus.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc src/onewire.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/tail.c
Simple merge

diff --cc src/tail_csv.c
Simple merge