Backport Chef patches

- Fixes #229 
- Fixes #232 
- Fixes #228 

/cc @opscode-cookbooks/release-engineers