[OE-5211] added letter macro text field so that the reported diagnosis for combinations of findings and diagnoses can be overridden using the secondaryto common ophthalmic disorder model.
[OEM-277] fixed bug editing users
[OE-5211] fixtures to support testing of the new diagnosis/correspondence combination mapping system.
Merge branch 'jira/OE-5211' into feature/glaucoma-2.1
Merge branch 'feature/glaucoma-2.1' into jira/OE-5174