Merge pull request #3632 from crosbymichael/stream-cp

Stream the cp operation on the client