Merge pull request #23194 from smillidge/fix-webservices-tck

Fixes remaining webservices TCK failures