Merge branch 'ok/disk' into collectd-4.4

Conflicts:

	configure.in

diff --cc configure.in
index 7e11fc8a8d286654690d362fc0ac8e6fa5605947,e94730d8311caf922ed31659fa58f851c6e0efa9..e95f99d63e48a34ab402962120aea4443779c281
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2331,7 -2331,7 +2331,8 @@@ f
  # libstatgrab
  if test "x$with_libstatgrab" = "xyes"
  then
 +      plugin_cpu="yes"
+       plugin_disk="yes"
        plugin_interface="yes"
        plugin_load="yes"
        plugin_memory="yes"

diff --cc src/Makefile.am
Simple merge