Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/Makefile.am
index c718621e974a0addd969705d85f484f50ec3b1b8,36b6bd77267d5b6eaf1bda44ea85fee8e0373709..07ffdda9ce58ec20107893a4513bef2d144c2ce1
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -99,11 -152,14 +99,12 @@@ if BUILD_PLUGIN_AMQ
  pkglib_LTLIBRARIES += amqp.la
  amqp_la_SOURCES = amqp.c \
                  utils_cmd_putval.c utils_cmd_putval.h \
+                 utils_parse_option.c utils_parse_option.h \
                  utils_format_graphite.c utils_format_graphite.h \
                  utils_format_json.c utils_format_json.h
 -amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
 +amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
  amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
  amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS)
 -collectd_LDADD += "-dlopen" amqp.la
 -collectd_DEPENDENCIES += amqp.la
  endif
  
  if BUILD_PLUGIN_APACHE

diff --cc src/collectd-nagios.c
Simple merge

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

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

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

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

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

diff --cc src/gmond.c
Simple merge

diff --cc src/liboconfig/scanner.l
Simple merge

diff --cc src/memcached.c
Simple merge