Merge pull request #2610 from opscode/sersut/circular-dep-fix

Resolve the circular dependency between ProviderResolver and Resource.
Conflicts:
	CHANGELOG.md