MAP-312: remove direct use of entity manager.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop