use core patch to fix excessive joins

#6391 

If a fieldCondition uses a delta-group and they are joining to the same table then just join to that table once.