[MONDRIAN-1694]  Native filter now omits a join to the fact table in a larger set of cases,

...and I missed fixing the expected sql in a couple tests with the previous checkin.