Merge pull request #2208 from opscode/jdmundrawala/env-path-spec-fix

restore ENV['PATH'] in env_spec after test is complete
Merge pull request #2217 from opscode/jdmundrawala/11-stable-env-path-spec-fix

Cherry-pick #2208 from opscode/jdmundrawala/env-path-spec-fix