Merge pull request #1871 from opscode/lcg/supermarket-urls

Lcg/supermarket urls
Conflicts:
	CHANGELOG.md
	spec/unit/knife/cookbook_site_download_spec.rb
	spec/unit/knife/cookbook_site_share_spec.rb
Merge pull request #2240 from opscode/sersut/backport-supermarket-switch

Backport cookbooks.opscode.com -> supermarket change to 11-stable.
DSC parameters should be passed even when there is no config data file
DSC terminology correction in insufficient powershell version message
Remove unnecessary contexts in DSC functional specs
Update CHANGELOG for DSC configuration parameter fix (Issue #2209)