merged package.json changes
CB-7494 Fixes wrong replacements in *.appxmanifest files
fix merge issue and make tabs 4 spaces
Merge branch 'CB-7494' of https://github.com/MSOpenTech/cordova-windows