Backported fixes

• Backport "Fix healAmbiguous to compareAlternatives with disambiguate = true" to 3.5.0 #21344

Contributors

Thank you to all the contributors who made this release possible 🎉

According to git shortlog -sn --no-merges 3.5.0-RC6..3.5.0-RC7 these are:

     5  Martin Odersky
     4  Wojciech Mazur
     2  Eugene Flesselle