Merge branch 'collectd-5.7' into collectd-5.8

diff --cc src/gps.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/write_riemann.c
Simple merge