Merge "Make Selenium tests work with AuthManager"