[ SPARK-1812] Adjust build system and tests to work with scala 2.11+ repl port.

Okay - fine to leave it as is then