Improve fix version method
Merge branch 'CB-5400' of https://github.com/Touchit/cordova-cli into CB-5107