Merge "Remove _setup_network_and_servers() in TestNetworkAdvancedServerOps"