Change Eclipse SBT plugin version to match Spark.
Update hard-coded Spark and BlbSpark jars.
Attempt to fix merge with mainline Shark.