Minor grammer, code conventions fix [ci skip]

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb
Merge pull request #14394 from zoltankiss/fix_typo

Minor grammer, code conventions fix [ci skip]