Also double the timeout for the upgrade spill-over test as it was running out after Main/PrevPrev/Prev