Automatic merge from submit-queue

Bump upgrade test timout to 10 hours

@spxtr is it reasonable to expect that running the v1.2 tests in serial would take longer than ~ 5 hours (assuming the upgrade beforehand takes < 1 hour)?