Merge "Correct skip condition for migrate_server"