Porting CHEF-3297 to 10-stable.

CI is looking happy (except a few unrelated windows failures)

http://ci.opscode.us/view/Chef%20Client%20Build%20Pipeline/job/chef-client-test/660/