Merge pull request #15358 from arthurnn/redefine_habtm_fix

Fix redefine a has_and_belongs_to_many inside inherited class
Conflicts:
	activerecord/CHANGELOG.md