Fix an issue with the OmitNoopJoin optimization and add test cases that

are specifically for that optimization.

FossilOrigin-Name: 5480d124b74c9adaacc4fa9cb81560865b44f3e1