MAP-187: fix warnings.
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service