Merge pull request #11346 from tomykaira/fix_10257

Check authentication scheme in Basic auth
Copy-edit at the CHANGELOGS [ci skip]
Merge pull request #14544 from jefflai2/named_scope_sti

Fixes Issue #13466.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays

Hash#deep_*_keys(!) recurse into nested arrays.

Conflicts:
	activesupport/CHANGELOG.md

Conflicts:
	activesupport/CHANGELOG.md
Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key

Fix polymorphic eager load with foreign_key as String.

Conflicts:
	activerecord/CHANGELOG.md
Add has_and_belongs_to_many back to reflections hash.

This adds back `has_and_belongs_to_many` reflection to the reflections
hash. Even thought we are not using that internally, as
`Model.reflections` is a public method we need to keep the hash of
reflections coherent.

ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1 is the commit that made
has_and_belongs_to_many became a has_many :through and a has_many.

[fixes #14682]
Small test syntax change