Fix warnings and move content service specific logic to content service.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/ContentServiceJpa.java