This commit uses the replacement for deprecated APIs in 8.5.16 to ease a forward compatibility with Tomcat 9 Closes gh-9611