back porting “HHH-7582 - TableGenerator does not distinguish between different tenants (MultiTenant Schema based)” to 4.2 branch