chef-4933

This is an updated version of https://github.com/opscode/chef/pull/1204.

Can I get a looksee from @opscode/client-engineers on the updated specs?