Merge "NameTableStore: ensure consistency upon rollback." into REL1_34