Cherry-picked scala-2.11 / sbt 2.13 changes from 732f1b7a6cf1005be514d6339ebee61f7587c90e