Merge pull request #966 from jbescos/upgradeASM

Ugrade ASM to support higher JDK versions