Merge "Removing {userspace} from reboot task'"