Merge branch 'collectd-5.4'

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/collectd.conf.in
index dcb1a7a0725d8fbfaeaba0a04cbcbd017677681e,5088eaeaabe9847b82cb3b1c74cf40b2c2fdb382..95734c266bb89af3dd4d4605cd6519fe40cad0cd
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -733,9 -676,8 +733,9 @@@
  #             Username "user"
  #             Password "secret"
  #             Interface "eth0"
 +#             ResolveInterval 14400
  @LOAD_PLUGIN_NETWORK@ </Server>
- #     TimeToLive "128"
+ #     TimeToLive 128
  #
  #     # server setup:
  #     Listen "ff18::efc0:4a42" "25826"

diff --cc src/cpu.c
Simple merge

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

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

diff --cc src/netlink.c
Simple merge

diff --cc src/utils_cmd_flush.c
Simple merge

diff --cc src/utils_cmd_getval.c
Simple merge

diff --cc src/utils_cmd_listval.c
Simple merge

diff --cc src/utils_cmd_putnotif.c
Simple merge

diff --cc src/utils_cmd_putval.c
Simple merge

diff --cc src/virt.c
Simple merge