Merge pull request #1832 from opscode/lcg/proxy-var-fixes

Lcg/proxy var fixes
Conflicts:
	CHANGELOG.md
Merge pull request #1838 from opscode/sersut/port-chef-1832

Merge pull request #1832 from opscode/lcg/proxy-var-fixes