Merge branch 'CB-7491' of https://github.com/MSOpenTech/cordova-mobile-spec