IBM has agreed to re-license the affected files.
A patch was provided by an IBM employee with a CLA on file under https://issues.apache.org/bugzilla/show_bug.cgi?id=49259
The files can now therefore be treated the same way as the other BCEL files.
The updated files have been applied to BCEL and I have copied them across to Tomcat 7 and made the same set of changes as I made previously.
The various LICENSE and NOTICE changes made in r934220 have been reverted.
Thanks to Kevan Miller and his IBM colleagues for working to resolve this so quickly.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@941955
13f79535-47bb-0310-9956-
ffa450edef68