Work around likely mapdb bug
Handle the same clinical var used in several cols

Fixes UAT-178.
Merge branch 'bugs/duplicated_clinical_var'