Fix #2186: Synchronize classpath handling with Scala 2.12#2191

smarter merged 2 commits intoscala:masterscala/scala3:masterfrom

dotty-staging:sync-classpath-scalacdotty-staging/dotty:sync-classpath-scalacCopy head branch name to clipboard