[1.7.x] Correct oversight in trove classifiers, as this branch is now beta status.
[1.7.x] Fixed #22265 -- Clarfied consistent behavior of migrations.

Thanks aruseni for the report.

Backport of bff77e2aa8 from master
[1.7.x] Updated six to 1.6.1.

Backport of 2ec82c7387 from master
[1.7.x] Fixed #21665 -- Documented that changes in assertRedirects may be required given new URL escaping behavior.

Thank pdc for the report.

Backport of 62e81bc00b from master
[1.7.x] Fixed #22247 -- Replaced "upstream" with "downstream" in cache docs.

Thanks valgarv at gmx.net for the report.

Backport of 60d2dde286 from master
[1.7.x] Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships.

Thanks EvilDMP for the suggestion.

Backport of ec08d62a20 from master
[1.7.x] Fixed typo in error message in django.contrib.sitemaps.

Backport of d81a9c50d8 from master
[1.7.x] Fixed #22293 -- Avoided renaming many-to-many tables to themselves.

Fixed this for both implementations of _alter_many_to_many, instead of
in `alter_db_table` itself (more implementations).

Backport of 1edfa155e3 from master