[Do Not Merge] Add support for multi column joins Ticket 19385

This is an operating but not final version. Still needs some polishing before merging. Please review and comment with questions/concerns.

-JeremyT