Changelog for https://github.com/opscode/chef/pull/2621
Merge branch 'tball/12-changelog' into 12-stable