Merge pull request #15772 from nbudin/sti_through_bug

Don't include inheritance column in the through_scope_attributes

Conflicts:
	activerecord/test/cases/associations/has_many_through_associations_test.rb