Merge branch 'jbrowning-fix_mariadb_rename_index'

Closes #15936

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb