Merge "Remove _create_router in scenario.manager"