Merge "Remove the list_servers_since_test"