Merge branch 'collectd-5.7'

Conflicts:
	contrib/systemd.collectd.service

diff --cc contrib/systemd.collectd.service
index 853363d,a3b689a..6333d49
--- 1/contrib/systemd.collectd.service
--- 2/contrib/systemd.collectd.service
+++ b/contrib/systemd.collectd.service
@@@ -30,9 -29,7 +30,7 @@@ ProtectHome=tru
  # By default, drop all capabilities:
  CapabilityBoundingSet=
  
- NoNewPrivileges=true
- 
 -# Tell systemd it will receive a notification from collectd over it's control
 +# Tell systemd it will receive a notification from collectd over its control
  # socket once the daemon is ready. See systemd.service(5) for more details.
  Type=notify
  

diff --cc src/ipc.c
Simple merge