Merge "Use built in cleanup for servers in test_large_ops"