Merge branch 'collectd-5.4' into collectd-5.5

diff --cc src/apache.c
Simple merge

diff --cc src/collectdmon.c
Simple merge

diff --cc src/curl.c
Simple merge

diff --cc src/curl_json.c
Simple merge

diff --cc src/curl_xml.c
Simple merge

diff --cc src/daemon/utils_cache.c
Simple merge

diff --cc src/gmond.c
Simple merge

diff --cc src/java.c
Simple merge

diff --cc src/memcachec.c
Simple merge

diff --cc src/powerdns.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/threshold.c
index a8900db76ce280aed62a1959f3d7ec84fcfda10c,391ee932aed1acf208bbd75c5fb56b243605ae0d..8dcb711d5e6004bb82d266b8d9e950242681c50d
--- 1/src/threshold.c
--- 2/src/threshold.c
+++ b/src/threshold.c
@@@ -512,13 -622,9 +512,12 @@@ static int ut_report_state (const data_
    if (state == STATE_OKAY)
    {
      if (state_old == STATE_MISSING)
-       status = ssnprintf (buf, bufsize,
-           ": Value is no longer missing.");
+       ssnprintf (buf, bufsize, ": Value is no longer missing.");
      else
-       status = ssnprintf (buf, bufsize,
 -      ssnprintf (buf, bufsize, ": All data sources are within range again.");
++      ssnprintf (buf, bufsize,
 +          ": All data sources are within range again. "
 +          "Current value of \"%s\" is %f.",
 +          ds->ds[ds_index].name, values[ds_index]);
    }
    else
    {

diff --cc src/utils_cmd_flush.c
Simple merge

diff --cc src/utils_cmd_putval.c
Simple merge

diff --cc src/utils_ignorelist.c
Simple merge

diff --cc src/utils_latency.c
Simple merge

diff --cc src/utils_rrdcreate.c
Simple merge