Merge remote-tracking branch 'origin/2.11.x-jdk8' into 2.12.x

Author: SethTisue

common.conf

@@ -42,7 +42,7 @@ vars: {
   scala-ref                    : ${?scala_ref}   // allow overriding scala-ref using the scala_ref environment variable
 
   // TODO: merge required changes upstream to get rid of our forks, maintaining our one won't scale
-  browse-ref                   : "lrytz/browse.git#2.12-compat"
+  browse-ref                   : "SethTisue/browse.git#topic/2.11-compat"
   lift-framework-ref           : "lift/framework.git#3.0-M2-release"
   spray-ref                    : "spray/spray.git#v1.3.3"
   // only building project twirl-api, fixed sha from master branch that has Scala 2.11 compatibility patches merged
@@ -133,7 +133,7 @@ vars: {
   spray-json-shapeless-ref     : "fommil/spray-json-shapeless.git#v1.1.0"
 
   // version settings
-  sbt-version                  : "0.13.11"
+  sbt-version                  : "0.13.12"
 }
 
 vars {