MAP-964: MORE EFFicient tree position remover
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop