sync with apache/tomcat70