Update timeouts for WebDriverWait to self.timeout
Merge branch 'master' of https://github.com/mozilla/Addon-Tests into sort_by_fix
Merge pull request #588 from bobsilverberg/sort_by_fix

Update timeouts for WebDriverWait to self.timeout