Updated to code to support latest commits on facebook/webdriver master branch