Fix preloading of st models on has_many through associations
#14312

moktin wants to merge moktin:11082_preload_sti_with_has_many_through into rails:master

We do not currently have an analysis of these two commits