Less forking on our dbuild configuration for Scala 2.11.

I'm slowly merging my Scala 2.11 patches upstream and switching off my forks.