EE changes to support sub-queries. Fix bug to preperly reconnect the parent best plan with the sub-query best plun