Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm

Fix to use custom join table in habtm
Conflicts:
	activerecord/CHANGELOG.md