Merge "Make live_migrate_server() use common method"