Accommodate Spark change to asm 4.0
Merge branch 'master-csd' of github.com:markhamstra/shark into master-csd