reverts changes to Rails.version made in #8501
Improve documentation around the cookie store auto-upgrade to encryption
Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docs

Improve documentation around the cookie store auto-upgrade to encryption
:uniq is still a valid relation option since it was only silently
deprecated

Fixes activerecord-deprecated_finders build.

https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703
Fixed typo on AP dispatch Mime::Type test
Merge pull request #10002 from charliesome/revert-version-method-on-rails

Reverts changes to Rails.version made in #8501
Remove CHANGELOG entry for #10002

[ci skip]
Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_test

Fixed typo on AP dispatch Mime::Type test