Merge pull request #10352 from zohlgren/fix_activerecord_sanitization_sanitize_sql_hash

Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions
Conflicts:
	activerecord/CHANGELOG.md
Fix test asserting the sanitized SQL hash differently to some adapters
Merge pull request #10478 from cainlevy/patch-1

use canonical #controller_path logic in controller test cases