new device launching strategy needs to use correct version
also, don't override retina/tall/64bit opts when user doesn't actually
pass in deviceName cap.
cc @dandoveralba
Merge pull request #2081 from appium/new-device-launching

new device launching strategy needs to use correct version