Add test for move/rename files.
Fix in-AWS file copy - need to reattach destination file.
Remove capabilities.
Merge remote-tracking branch 'upstream/branch-2.2.x' into branch-2.2.x