GROOVY-6553: Make normal Groovy jars use repackaged dependencies too
Fix groovysh broken after refactor for GROOVY-6553
Merge pull request #373 from melix/GROOVY-6553

GROOVY-6553: Make normal Groovy jars use repackaged dependencies too