Merge "Update Tomcat version to 9.0.x (was 8.0.x)"