Make code more compatible with upstream collectd
Merge branch 'patch/perfwatcher_addons' into release/5.3.0