Bug 1009099 - Remove wait_for_* methods from GaiaTestCase where possible