Merge pull request #2631 from opscode/jdm/kitchen-tests

Constrain version of database cookbook
Merge pull request #2629 from opscode/jdm/shellout-spec

Cleanup Mixin:ShellOut use/specs
Merge pull request #2637 from opscode/jdm/issue-2626-rebase

Jdm/issue 2626 rebase
Added CHANGELOG for issue 2625
Merge pull request #2623 from opscode/sersut/revert-1901

Preserve relative paths in Link resource
Conflicts:
	spec/functional/resource/link_spec.rb
	spec/unit/provider/link_spec.rb

Conflicts:
	CHANGELOG.md