Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	configure.in

diff --cc configure.in
index 4da57fc,d9dd13a..9337523
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2418,12 -2227,8 +2422,14 @@@ AC_SUBST(PERL_BINDINGS_OPTIONS
  
  AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
  
- if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
++if test "x$with_rrdtool" = "xyes" \
++      && test "x$librrd_threadsafe" != "xyes"
 +then
 +      with_rrdtool="yes (warning: librrd is not thread-safe)"
 +fi
 +
- if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
+ if test "x$with_liboping" = "xyes" \
+       && test "x$with_own_liboping" = "xyes"
  then
        with_liboping="yes (shipped version)"
  fi