CHEF-3731 for Chef 11

Figured out the magic git config to cherry pick between 10-stable and master (FTR: `git config merge.renameLimit 10000` was the cargo that made the airplanes come).

- https://tickets.opscode.com/browse/CHEF-3731
- https://github.com/opscode/chef/pull/571