CA-140684: Handle cancellation of VM migration properly

Suggested-by: Yunlei Ding <yunlei.ding@citrix.com>
Signed-off-by: Euan Harris <euan.harris@citrix.com>
Merge pull request #1884 from euanh/CA140684

CA-140684: Handle cancellation of VM migration properly