Merge branch 'CHEF-2682'

Conflicts:
	chef/lib/chef/exceptions.rb

Fixes CHEF-2682 for 10-stable