Longer timeouts on live upgrades
Move shrinking/resize out of workflow