Merge branch 'CB-6615' of https://github.com/MSOpenTech/cordova-plugman