Index-join scan trimming heuristics rework II

Change-Id: I9cf63be7967a012559e27dc4ca950bb28b8ccd3b
Merge "Index-join scan trimming heuristics rework II"