Put all upgrade encrypted tests back on UEFI
    
    They use base disk images, and it's too fiddly to try and
    arrange for the one the update test uses to be UEFI but the
    other to be BIOS...let's just keep these on UEFI but kick up the
    retry count :/
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>