MAP-1036: improvement to reports
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop