Merge "Add list servers to large ops test"