tomcat: update to upstream master