Update deploy.rb

Typo in symliinks
Added require 'chef/cookbook_uploader' to file 'chef/knife/cookbook_upload.rb'
Merge branch 'CHEF-3937'
CHEF-3920: tighten wording to be more DRY.
[CHEF-3872] Adding support for platform XCP/xcp, which is the open source version
fix deprecation warning. Fixes CHEF-3847
execute check existense of sentiel file with respect to cwd
Merge branch 'CHEF-3819'
Fix regular expression for symlinks in device_mount_regex
Add comment to regular expression and add unit tests
Remove string interpolation and adjust comment
Merge branch 'CHEF-3804'
Check if mount options have changed in the enable action
Add unit tests
Merge branch 'CHEF-3803'
improved error message
Merge branch 'CHEF-3735'
[CHEF-3452] Failing spec for frozen cookbook upload
[CHEF-3452] uploading frozen cookbook version explodes

This change make Chef::CookbookUploader for testing whether a cookbook
upload has failed due to a frozen version existing on the server.

This fixes a regression introduced by 7c7b4ea1.
[CHEF-3452] Fix expectation for frozen cookbook upload failure