TRUNK-4044 - EncounterType and EncounterRole names must be unique
Merge pull request #1114 from jkondrat/TRUNK-4044

TRUNK-4044 - EncounterType and EncounterRole names must be unique