Restoring https://github.com/opscode/chef/pull/1921 to master

Somehow, it got totally deleted from master.  @jtimberman @adamedx @mcquin @lamont-granquist could you give this a quick review before it goes to master?  I checked the diff - it is the same as the commit from that PR.
Yeah, there was 1 file with conflicts when rebasing.  I resolved 1 of the conflicts in the file and neglected to scroll down to the second conflict.  Lesson learned - use the tooling!