Merge "Separate server_groups_client from servers_client"