Code

collectd.conf: pull in upstream updates for 5.8