Merge Kexec hardboot changes