Merge "Rename base.rebuild_server to base.recreate_server"