Get proper Windows full pkg name
Merge pull request #5185 from UtahDave/develop

Get proper Windows full pkg name