Constructing a row key with PK parts of tenantId and tenantTypeId columns.  @jtaylor-sfdc, can you verify that this will work OK with salted tables?