NEXUS-6537: Do a move when possible

Assume it's possible, if not, fallback
to copy+delete that happened until now