Merge changes from bcel r1521061-1547757

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