Merge pull request #2263 from jlipps/master

ensure we can use appium 1.0 style launch information from the command line
update uiauto to take advantage of new hideKeyboard strategy (fix #1153)