CB-5067: added exception incase no platform level config.xml or defaults.xml exisit

Also updated cli to use 3.1.0 instead of 3.1.0-rc1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
updated to a version greater than our latest version on npm