Merge pull request #2252 from opscode/jdmundrawala/env-split

Modified env resource to break values up by delimiter before comparing
Merge pull request #2305 from opscode/jdmundrawala/11-env-split

Pick pull request #2252 from master