tomcat 7.0.53 upgrade from trunk was not correctly merged, adding some things preventing TCKs to pass

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.6.0.1@1583464 13f79535-47bb-0310-9956-ffa450edef68