Merge pull request #15269 from arunagw/aa-fixes-8930

rake railties:install:migrations respects the order of railties

Conflicts:
	activerecord/CHANGELOG.md
	railties/lib/rails/application.rb
Revert "Merge pull request #12778 from etehtsea/rake-default-fix"

This reverts commit a263d0b368fbd074bff3ee9058d13b457eaa3116.

Conflicts:
	railties/CHANGELOG.md
Merge pull request #15393 from tonytonyjan/patch-2

Fix documentation
Correctly pass joins when creating a JoinDependency.

Backport of #14834 to 4-0-stable
Add missing `:param` option from the docs for Mapper#match [ci skip]
Option discovered by @zackperdue in #14741, implemented in #5581.
Merge pull request #15396 from al2o3cr/issue14834-backport-4-0

Correctly pass joins when creating a JoinDependency.
[ci skip] Document Rails' shifted semver.

Conflicts:
	guides/source/maintenance_policy.md
Merge pull request #11896 from nkondratyev/fix_pg_columns_for_distinct

Fixed #columns_for_distinct of postgresql adapter

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Change the version schema to reflect how deprecations are handled

[ci skip]

We only introduce new deprecations at Minor releases.