Merge "Merge list_servers_with_detail to list_servers"