Extend some boot timeouts in upgrade tests
    
    Sometimes rebooting during upgrade tests seems to take longer
    than these timeouts allow, so let's bump them a bit.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>