Cross-build to 2.11.0-RC3, cleaner build.sbt