Merge branch 'collectd-4.8'

Conflicts:
	src/types.db

diff --cc README
Simple merge

diff --cc src/types.db
index c6526d4,8ac9dd4..960674c
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -125,8 -121,7 +125,8 @@@ ps_stacksize               value:GAUGE:0:92233720368
  ps_state              value:GAUGE:0:65535
  ps_vm                 value:GAUGE:0:9223372036854775807
  queue_length          value:GAUGE:0:U
- records                 count:GAUGE:0:U
 +response_time         value:GAUGE:0:U
+ records                       count:GAUGE:0:U
  route_etx             value:GAUGE:0:U
  route_metric          value:GAUGE:0:U
  routes                        value:GAUGE:0:U