Adds extra parameters the multiple Scala versions

Passing the version is different in lithium, but both style can be
used at the same time.
Bumps Scala version for 3.0.4
REPLACE PRE-TAG & MASTER BY REAL TAGS

Config for 4.0.0-m2 on 2.11.1 and 2.10.4