Merge branch 'collectd-5.3' into collectd-5.4

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
index 1c1e34c6fbbfc76fbd9665dc3606401e40eea771,e9e71d631aa1509fe4f7c404c9a05ffc4f52dc37..d3f267491df5d67a702290e440c4448dcccc55b7
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -194,9 -183,9 +194,9 @@@
  # plugin zfs_arc disabled, requires FreeBSD/Solaris
  %define with_zfs_arc 0%{!?_without_zfs_arc:0}
  
- Summary:      Statistics collection daemon for filling RRD files
+ Summary:      statistics collection and monitoring daemon
  Name:         collectd
 -Version:      5.3.2
 +Version:      5.4.2
  Release:      1%{?dist}
  URL:          http://collectd.org
  Source:               http://collectd.org/files/%{name}-%{version}.tar.bz2

diff --cc src/amqp.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc version-gen.sh
Simple merge