Merge "Rename test_list_servers_filter_by_server_status"