[upstream] Cleanups and fix typos in boot scripts.