Merge "Fix tenant isolation and unit tests with py3"