Merge "Revert "init: make reboot_on_failure not apply to manually stopped services""