Fixed the last of regressions related to merge
Unused variable removal
Spelling fixes
First pass at tenant data isolation for querying and DML.  SELECT and DELETE are in good shape.  UPSERT still borked.  Test for all of these are in this commit.