Merge "[563349] Add initial support for Tomcat 10"