CA-86347: Retry when migrate fails due to VM reboot
Merge pull request #1509 from thomassa/CA-86347v06cleaned

CA-86347: Retry when migrate fails due to VM reboot