Backport https://github.com/opscode/chef/commit/e85f791ece68e43053acfe44a032687958127c32#diff-b836df330d72a9936114f35ce437c418R487.
Merge pull request #1655 from opscode/sersut/CHEF-3075

Backport https://github.com/opscode/chef/commit/e85f791ece68e43053acfe44...