First merge try from tag 1.6.0 with Tomcat 7.0.52 changes

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