Merge "systemd: Always create the systemd unit files"