Chef 4406 11 stable

Master/11.8.0 patch: https://github.com/opscode/chef/pull/933/

Contains only minimal fix for CHEF-4406 suitable for hotfix/patch release.