SSPCPP-412 - systemd integration changes