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

Author: SethTisue

common.conf

@@ -28,7 +28,8 @@ vars: {
   //   the use of typesafe-config 1.3.0
   //   https://github.com/playframework/interplay/commit/73f7c9b434be180c27611aebb089d55f6445bcf5#commitcomment-11275807
   play-twirl-ref               : "playframework/twirl.git#pull/45/head"
-  spray-json-ref               : "spray/spray-json.git"
+  // freeze just before move to sbt 1 (since sbt 1 doesn't work on Java 6)
+  spray-json-ref               : "spray/spray-json.git#216fae2a"
   // fixed sha from 2.10.x branch that has Scala 2.11 compatibility patches merged
   scala-io-ref                 : "adriaanm/scala-io.git#community-build"
   json4s-ref                   : "json4s/json4s.git#v3.2.10_2.11"