Merge "Cleanup existing instances in setup for test_list_servers_negative.py"