TOMEE-740 tomcat 7.0.41 + minor fixes needed because of two previous commits

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