Merge pull request #14793 from arthurnn/fixes_8928

Fixed has_many association to make it support irregular inflections.
Conflicts:
	activerecord/CHANGELOG.md