CHEF-1940:Patch for https://github.com/opscode/chef/issues/1940

Attached patch for - https://github.com/opscode/chef/issues/1940