Fix Baseclass becomes! subclass.
Merge pull request #16403 from Peeja/baseclass-becomes-subclass-for-4-1

Backport "Fix Baseclass becomes! subclass." for 4.1

Conflicts:
	activerecord/CHANGELOG.md