Merge branch 'collectd-5.3'

Conflicts:
	configure.in

diff --cc configure.in
index 16bffbaba6e403d0a26ac1ec3d4c8f3cf3dbdbc9,d207c2889ba34c4b34d957f49f742f72793e9a0d..c23df178ca1ac0c9dd464894ca1fb407bd32fb78
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -5452,8 -5259,7 +5452,8 @@@ Configuration
      libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
-     lpar... . . . . . . . $enable_lpar
+     lpar  . . . . . . . . $enable_lpar
 +    lvm . . . . . . . . . $enable_lvm
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter
      match_hashed  . . . . $enable_match_hashed

diff --cc src/memcached.c
Simple merge

diff --cc src/rrdtool.c
Simple merge