Merge pull request #19199 from crosbymichael/migrate-errors

Fixed migrate defect, allow migrate the empty directory