Updated changelog
Merge pull request #1502 from opscode/shain/changelog

Updated changelog CHEF-4893 + CHEF-5095