Added require 'chef/cookbook_uploader' to file 'chef/knife/cookbook_upload.rb'
Merge branch 'CHEF-3937'