Review index on tenant data's expiry

[wolpert]

The expiry index does not limit to non-null values. Hsqldb doesn't support that syntax but allows it for backwards compatibility. Need to figure out if that's going to be a problem