Fixes finding the zinc build base files
Adds extra parameters the multiple Scala versions

Passing the version is different in lithium, but both style can be
used at the same time.
(cherry picked from commit 55067807e581bc0119bc24edeb8c6e415ef74c29)