Allow tbl in i to use 'i.' and 'x.' prefixes in joins

Allow tbl in i to use 'i.' and 'x.' prefixes in joins #2405