MAP-461: NPE problems in map comparison when things that can be null are compared with .equals
MAP-397: Apache Tomcat Error Message
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop