HHH-8175 Test fixes for postgresplus92
HHH-8178 Natural IDs generate one UniqueKey for all columns