Merge branch 'CHEF-5048'

fixes https://tickets.opscode.com/browse/CHEF-5048