Bring back JDK 6 safe guard code when building with Scala 2.10 and 2.11.
Bring back JDK 6 safe guard code when building with Scala 2.10 and 2.11.

scalatest/scalatest,cheeseng/scalatest,scalatest/scalatest,dotty-staging/scalatest,cheeseng/scalatest,dotty-staging/scalatest,cheeseng/scalatest,scalatest/scalatest,dotty-staging/scalatest