Merge "Fix images tests with tenant isolation disabled"