Updates to s_server and s_client for the latest early_data API changes