Merge pull request #2328 from opscode/sersut/win-spec-fix

Fix windows specs for windows package type.
Merge pull request #2330 from opscode/sersut/cherry-pick-win-spec

Merge pull request #2328 from opscode/sersut/win-spec-fix