This commits moves the single use of that property to the already existing Tomcat-specific one. Closes gh-16673