Merge branch 'collectd-5.5'

diff --cc src/libcollectdclient/client.c
Simple merge

diff --cc src/libcollectdclient/collectd/client.h
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/utils_db_query.c
Simple merge