1036: qa fixes and some other minor things.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop