CLEANUP: restore import.sql, handle closing of metadata service properly.
CLEANUP: no changes!
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	admin/mojo/src/main/java/org/ihtsdo/otf/mapping/mojo/MapProjectDataImportMojo.java
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/SnomedMetadataServiceJpaHelper.java