Fix duplicate table alias error when including an association with a has_many :through association on the same join table.  Closes #7310 [cavalle]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9095 5ecf4fe2-1ee6-0310-87b1-e25e094e27de