Merge Appium branch to devel

This PR has changes for Appium Android, Appium iOS and Calabash iOS.