Merge "Selenium: use default value for waitforTimeout"