MAP-964: Finishing touches on non-rule-based projects.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop