CLC-4275: fix test flow control and OAuth handling for Google-related tests
Merge pull request #2955 from pfarestveit/ui-tests

CLC-4275: fix test flow control, OAuth handling for Google-related Selenium tests