typo rectified [skip ci]
Merge pull request #13270 from aayushkhandelwal11/typos

typo rectified
Remove require 'models/administrator', Administrator is not used in secure password test
Merge pull request #13273 from robertomiranda/test-remove-require

Remove require 'models/administrator', Administrator is not used in secure password test
removing multiple check conditions to single check condition
Merge pull request #13276 from aayushkhandelwal11/change_to_key

removing multiple check conditions to single check condition
Bring back the valid_options class accessor

It is need in activerecord-deprecated_finders
Revert "Merge pull request #12518 from vipulnsward/remove_count_options"

It is needed for activerecord-depecated_finders

This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing
changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f.
Mark the arguments needed by activerecord-deprecated_finders with a TODO
Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"

This will call primary_key two times

This reverts commit d0588a2e897d33c6c12e9fc5f8680328d37a26ca, reversing
changes made to 87e1e86640fb8b5a260ff7c0044aaae58fff2bc4.