merged with Wei branch 6258-choose-cordova-version
merged with Wei branch 6258-choose-cordova-version

paolobueno/fh-fhc,grdryn/fh-fhc,shannonmpoole/fh-fhc,wei-lee/fh-fhc,david-martin/fh-fhc,nialldonnellyfh/fh-fhc