TRUNK-3283 Add observation to an encounter: the field person can be overwritten, and it leads to inconsistent behaviour after saving
TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list
Merge pull request #549 from lrozanski/TRUNK-3898-master

TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list
Merge pull request #542 from tadeitto/TRUNK-3283

TRUNK-3283 Add observation to an encounter: the field person can be over...