Chef 3714

Rebase of [CHEF-3714](https://tickets.opscode.com/browse/CHEF-3714) to merge in changes from [CHEF-5018](https://tickets.opscode.com/browse/CHEF-5018).