Merge cosmetic changes from trunk. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624500 13f79535-47bb-0310-9956-ffa450edef68
BCEL changes that were then reverted

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624502 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@1624503 13f79535-47bb-0310-9956-ffa450edef68