Upgrade failed due to unclean database shutdown

We should increase our timeouts here @falco to make them safer.