Poldek [CHEF-4476]

Creating a Pull Request from @glensc branch so we can track review comments.

https://tickets.opscode.com/browse/CHEF-4476