Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
	src/write_redis.c

diff --cc src/daemon/collectd.h
Simple merge

diff --cc src/daemon/common.c
Simple merge

diff --cc src/postgresql.c
Simple merge

diff --cc src/target_notification.c
Simple merge

diff --cc src/utils_format_graphite.c
Simple merge

diff --cc src/utils_format_json.c
Simple merge

diff --cc src/utils_format_json.h
Simple merge

diff --cc src/write_redis.c
Simple merge