Merge pull request #23896 from arjantijms/servlet6tck

Fix remaining Servlet 6 TCK failures