Revert "Update pom.xml to reference hapi-fhir 6.3.6-SNAPSHOT. This hapi-fhir release contains a fix for POSTing an XML resource with comments results in a fhir_comments error (#465)" (#476)

This reverts commit 9a513cd184.

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java

@@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.jpa.config.JpaDstu2Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnDSTU2Condition;
+import ca.uhn.fhir.jpa.term.TermCodeSystemStorageSvcImpl;
 import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl;
 import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc;
 import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc;
@@ -23,4 +24,9 @@ public class FhirServerConfigDstu2 {
 		return new TermLoaderSvcImpl(theDeferredStorageSvc, theCodeSystemStorageSvc);
 	}
 
+	@Bean
+	public ITermCodeSystemStorageSvc termCodeSystemStorageSvc() {
+		return new TermCodeSystemStorageSvcImpl();
+	}
+
 }

src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java

@@ -206,6 +206,16 @@ public class StarterJpaConfig {
 		return packageInstallerSvc;
 	}
 
+	@Bean
+	@Primary
+	/*
+		This bean is currently necessary to override from MDM settings
+	 */
+	IMdmLinkDao mdmLinkDao() {
+		return new MdmLinkDaoJpaImpl();
+	}
+
+
 	@Bean
 	@Conditional(OnCorsPresent.class)
 	public CorsInterceptor corsInterceptor(AppProperties appProperties) {