CHEF-3237: Incorporated the comments on PR 624

I rebased Igor's changes and incorporated Bryan's review comments on [pull request 624] (https://github.com/opscode/chef/pull/624).