Fix upgrade repropose

BTW I see that `Bootloader.setLoaderType` forwards to `BootCommon.setLoaderType` . Wouldn't that be better usage?