Scoping reserved names
#31179

kinnrot wants to merge kinnrot:scoping-reserved-names into rails:master

We do not currently have an analysis of these two commits