Updating to include 7951.

Passing build:

http://andra.ci.opscode.us/job/chef-server-trigger-ad-hoc/56/downstreambuildview/