Merge branch 'collectd-5.3' into collectd-5.4

diff --cc configure.ac
Simple merge

diff --cc src/curl_xml.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/zfs_arc.c
index 96ffc54957aae84a8fb548e3df352307a9a9d168,311a718125bd7d1c7c5dba61606714b0a00cca55..3a54ad8d57d92c97a6ef9b2050c8b68e02fef682
--- 1/src/zfs_arc.c
--- 2/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -158,9 -120,16 +158,16 @@@ static int za_read (void
  
        /* Sizes */
        za_read_gauge (ksp, "size",    "cache_size", "arc");
-       za_read_gauge (ksp, "l2_size", "cache_size", "L2");
+ 
+       /* The "l2_size" value has disappeared from Solaris some time in
+        * early 2013, and has only reappeared recently in Solaris 11.2.
+        * Stop trying if we ever fail to read it, so we don't spam the log.
+        */
+       static int l2_size_avail = 1;
+       if (l2_size_avail && za_read_gauge (ksp, "l2_size", "cache_size", "L2") != 0)
+               l2_size_avail = 0;
  
 -        /* Operations */
 +      /* Operations */
        za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
  #if __FreeBSD__
        za_read_derive (ksp, "allocated","cache_operation", "allocated");