Reorganize branches for better performance.
The "docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") && !file.isDirectory()" condition was the same in both branches.

It is merge of r1624657 from tomcat/trunk.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624664 13f79535-47bb-0310-9956-ffa450edef68
Memory efficiency: Use a shared emptySet() as the value for JavaClassCacheEntry.sciSet when there are no SCIs for a class.

It is merge of r1624655 from tomcat/trunk.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1624665 13f79535-47bb-0310-9956-ffa450edef68
Remove serialization support and serialVersionUID fields from BCEL classes.

It is merge of r1624563 from tomcat/trunk.

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