Merge pull request #2613 from sebv/master

Enabling gappium ci tests
fixed basics tests
upgraded appium-uiauto