Some build changes we'll need for 2.11.

This still won't build 2.11.0-RC4 as is, because ufcheck depends on
scalacheck and that build is only compatible with some different
pre-release version of 2.11.