Merge pull request #2313 from opscode/sersut/win-res-lookup-fix

Make sure windows_service and windows_package resources are found with the new dynamic provider resolver.
Conflicts:
	spec/unit/resource/windows_package_spec.rb
windows_package installer_type should be a symbol

Fixes #1997

Conflicts:
	spec/unit/resource/windows_package_spec.rb
Merge pull request #2327 from opscode/sersut/rc-spec-fixes

RC Spec fixes for 12-stable