FARRAGO: integrate comment conflict in multiset.ref
FARRAGO: integrate comment conflict in multiset.ref

[git-p4: depot-paths = "//open/dev/": change = 6305]

LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb