MAP-311: some additional cleanup.
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service