merge 2.10.x

review by @jsuereth

note that it's import to follow the same structure as scala/scala

the https://scala-webapps.epfl.ch/jenkins/view/scala-release/ jobs rely on a ref (usually a tag, but you can also use a branch name for testing) that exists both in scala/scala and scala/scala-dist