Merge pull request #14965 from eric-chahin/issue_14824

Fixed the inferred table name of a HABTM auxiliar

Conflicts:
	activerecord/CHANGELOG.md