Merge "Update test_server for conncurrent client auth"