Merge "test_network_advanced_server_ops: cleanup class scope variable usage"