Fix #1036 - Uniquify table aliases when building Include queries