FPORT: Fix sbt/sbt#2431 by Duhemm · Pull Request #2590 · sbt/sbt
Forward port of #2500 Remark: Depends on a new version of sbt/librarymanagement