CLEARWATER: CA-101699: Fixes for concurrent VM/VDI copy