Merge remote-tracking branch 'github/pr/1054'

diff --cc configure.ac
index 87d1502,d4e3301..f713ce1
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5288,9 -5244,9 +5289,10 @@@ f
  if test "x$with_kstat" = "xyes"
  then
        plugin_nfs="yes"
 +      plugin_processes="yes"
        plugin_uptime="yes"
        plugin_zfs_arc="yes"
+       plugin_zone="yes"
  fi
  
  if test "x$with_devinfo$with_kstat" = "xyesyes"

diff --cc src/Makefile.am
Simple merge

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