launchAndKill gets passed a condition function, instead of a timeout. pa...

...rt of Fix for appium/2612
ah oops, merged the file wrong.

I'll run the tests AFTER merging on git, rather than b4 :/