[backport] Scala 2.11 and Scalacheck 1.11

Essentially a combination of #583 and #589 with a couple of tweaks.