Amend:  removed commented out concepts for mapping testing state code.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop
Bug fix preventing compilation in MappingServiceRestTest.java