XCOMMONS-442: Upgrade to Selenium 2.35
* Simplify the code.