Merge more simplification from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624526 13f79535-47bb-0310-9956-ffa450edef68
Merge more simplification from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624527 13f79535-47bb-0310-9956-ffa450edef68
Port removal of unused code from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624529 13f79535-47bb-0310-9956-ffa450edef68
Port removal of unnecesary code from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624533 13f79535-47bb-0310-9956-ffa450edef68
Port more code removal from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624534 13f79535-47bb-0310-9956-ffa450edef68
Port more code removal from trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624535 13f79535-47bb-0310-9956-ffa450edef68
Clean up merge errors and align code wth trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624541 13f79535-47bb-0310-9956-ffa450edef68
Add performance test

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624543 13f79535-47bb-0310-9956-ffa450edef68