Backported fixes

• Tweak selection from self types #18467
• Revert "Add reflect defn.FunctionClass overloads" #18473

Contributors

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

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

     3	Paweł Marks
     1	Martin Odersky