Merge "Remove unused allow_tenant_reuse flag"