revert changes to allow multiple identifiers with same identifier types TRUNK-4293
TRUNK-3717 Display the inherited roles when searching for users by role under User Management
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
Merge pull request #1129 from kkaczmarczyk/TRUNK-3717

TRUNK-3717 Display the inherited roles when searching for users by role ...
Dropping foreign key on patient.tribe - TRUNK-4492
TRUNK-3856 More indentation on location hierarchy simple widget
Merge pull request #1125 from jbuczynski/TRUNK-3856

TRUNK-3856 More indentation on location hierarchy simple widget
added warning for short patient form and patient form
Merge pull request #1071 from harsha89/TRUNK-4293-additional

revert changes to allow multiple identifiers with same identifier types TRUNK-4293