Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
	src/Makefile.am

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index e24d85b9c88c2e27ca30cca583fbc4b054e13955,7f2c88624588a9aedb0feb360ea8aa1873a00743..0ab4e99b593a5762c812c71cea3bb5bba50976ac
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -877,17 -1032,21 +877,17 @@@ endi
  if BUILD_PLUGIN_RRDCACHED
  pkglib_LTLIBRARIES += rrdcached.la
  rrdcached_la_SOURCES = rrdcached.c utils_rrdcreate.c utils_rrdcreate.h
- rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -rrdcached_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRRD_LDFLAGS)
++rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
  rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
- rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS)
+ rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
 -collectd_LDADD += "-dlopen" rrdcached.la
 -collectd_DEPENDENCIES += rrdcached.la
  endif
  
  if BUILD_PLUGIN_RRDTOOL
  pkglib_LTLIBRARIES += rrdtool.la
  rrdtool_la_SOURCES = rrdtool.c utils_rrdcreate.c utils_rrdcreate.h
- rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -rrdtool_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRRD_LDFLAGS)
++rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
  rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
- rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS)
+ rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
 -collectd_LDADD += "-dlopen" rrdtool.la
 -collectd_DEPENDENCIES += rrdtool.la
  endif
  
  if BUILD_PLUGIN_SENSORS

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/statsd.c
Simple merge