Merge "Make run-test give extra time when doing gc-stress runs."