Patially revert back the last commit related to NLIJ/inlined Index Scan for outer joins
Merge remote-tracking branch 'origin/eng_3038' into ENG-3038