Fix so that scala-library can be found
Merge pull request #2346 from benmccann/scala-lib

Backport fix from master to 2.2.x so that scala-library can be found