CB-7576 Support 'windows' merges folder for Windows platform
CB-7578 Windows. Fix platform name reported by pre_package hook