Bug 1009099 - Remove wait_for_* methods from GaiaTestCase where possible
Merge pull request #21630 from zacc/bug_1009099

Bug 1009099 - Remove wait_for_* methods from GaiaTestCase where possible