Conflicts: chef-server-api/app/controllers/cookbooks.rb features/api/cookbooks/upload_cookbooks.feature