Squashed commit of the following
commit 1d1eff27 Author: David Meng xlmeng@amazon.com Date: Wed Sep 28 2022 15:10:34 GMT-0400 (Eastern Daylight Time)
Upgrade Tomcat
commit 1d1eff27 Author: David Meng xlmeng@amazon.com Date: Wed Sep 28 2022 15:10:34 GMT-0400 (Eastern Daylight Time)
Upgrade Tomcat