Merge pull request #1308 from loic/ticket20462

Fixed #20462 - Replaced the str() cast introduced in 273dc55 by force_text()
Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk.

uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.

Thanks jonash for the initial patch and claudep for the review.
Add missing preposition in documentation
Merge pull request #1309 from treyhunner/patch-1

Add missing preposition in documentation.
Fixed #20665 -- Missing backslash in sitemaps documentation

Thanks to roman for the report.
Fixed #20541 -- don't raise db signals twice when creating superuser
Fixed #20590: Documented new test case ordering
Add related_query_name to ForeignKey/M2M. Refs #20244
Fixed LOGGING setting docs
Merge pull request #1311 from loic/ticket20619_take2

Fixed missing initializations in WSGIRequest. Refs #20619
Docs for related_query_name
Fixed #20244: PermissionsMixin now defines a related_query_name for M2Ms
Fixed #20619 -- Refactored HttpRequest and WSGIRequest
Added back lazy-loading for POST and FILES to prevent consuming the stream too early