CB-6148: Fix cross-filesystem copy and move