copied latest updates from opscode-cookbooks