Issue 1088 upgrade tomcat