Merge "Use bootloader_override from boot namespace"