Merge pull request #15579 from sgrif/sg-through-associations

Through associations should set both parent ids on join models
Conflicts:
	activerecord/CHANGELOG.md