Merge branch 'collectd-5.6'

Conflicts:
	src/collectd.conf.in

diff --cc src/apache.c
Simple merge

diff --cc src/collectd.conf.in
index 7ac9f2d24f644c7328e3a086abaece15e2ba8f6e,f0ac28713b1f30195df8e20683b314dec92402c9..6a207aba7305d80ef73aa74bcf80b5086fa3d67c
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1415,7 -1408,7 +1415,8 @@@
  #    StoreRates true
  #    AlwaysAppendDS false
  #    EscapeCharacter "_"
+ #    SeparateInstances false
 +#    DropDuplicateFields false
  #  </Node>
  #</Plugin>
  

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

diff --cc src/curl_json.c
Simple merge