swift234

rename two variables: distinguishing between "overridden" and "overriding"
was too difficult/subtle.  rename them to "base" and "override" to make it
easier to read this code. NFC.


Swift SVN r15057