Merge pull request #18259 from arthurnn/return_nil_on_multi_pk

Ensures that primary_key method will return nil when multi-pk
Conflicts:
	activerecord/CHANGELOG.md