Merge "Fix common systemd pitfalls die msg"