Merge pull request #2024 from opscode/jdmundrawala/windows_env_path

Windows path fix
Conflicts:
	spec/functional/resource/env_spec.rb
Updated CHANGELOG for env resource change
Merge pull request #2142 from opscode/jdmundrawala/11-windows-env-fix

Jdmundrawala/11 windows env fix