Merge branch 'rm-fix-13648'

Includes https://github.com/rails/rails/pull/14711 and some cleanup
commits.

Fixes #13648

Conflicts:
	activerecord/CHANGELOG.md