Merge pull request #677 from jbonofre/AMQ-8300

[AMQ-8300] Upgrade to tomcat 9.0.46