Fix the semantics of restart job deadlock avoidance during early boot and shutdown.
Replace one sysv-generator patch with the version I submitted upstream.