Revised mapCategoryId for ComplexMap release
Final fixes to Long/String comparison causing bugs with map relations in release
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop