MAP-365: better management of modifier preferred names.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop