Merge "Remove scenario.manager.rebuild_server"