Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many

Fix the `:primary_key` option for `has_many` associations.
Conflicts:
	activerecord/CHANGELOG.md