Build against Scala 2.10.4.
Backport Scalatest upgrade from 2.11 branch to minimize delta.