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

Lcg/proxy var fixes

Conflicts:
	CHANGELOG.md