diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
index 6dddbc0..c92e987 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-one_consumer.properties
@@ -1,34 +1,34 @@
-#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178988019
-#Mon Aug 13 09:49:48 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=GET
-password=secret
-routeOffer=MR1
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-username=key
-Version=1.0
-group=junit-client
-timeout=1000
-SubContextPath=/
-authDate=2016-02-18T13\:57\:37-0800
-filter=
-authKey=01234567890abcde\:01234567890abcdefghijklmn
-Environment=TEST
-host=192.168.1.1
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-id=junit-consumer-one
-Latitude=50.000000
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPNOAUTH
-AFT_ENVIRONMENT=AFTUAT
-limit=5
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120536
+#Fri Nov 23 13:18:40 EST 2018
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=GET
+password=admin
+routeOffer=MR1
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+username=admin
+Version=1.0
+group=junit-client
+timeout=15000
+SubContextPath=/
+authDate=2016-02-18T13\:57\:37-0800
+filter=none
+authKey=01234567890abcde\:01234567890abcdefghijklmn
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+id=junit-consumer-one
+Latitude=50.000000
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPNOAUTH
+AFT_ENVIRONMENT=AFTUAT
+limit=1000
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
index f80f762..d36ad03 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-consumer-two_consumer.properties
@@ -1,30 +1,30 @@
-#consumer.properties file created on the fly for topic:JunitTopicOne on:1534178854566
-#Mon Aug 13 09:47:34 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=GET
-routeOffer=MR1
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-Version=1.0
-group=junit-client
-timeout=15000
-SubContextPath=/
-filter=none
-Environment=TEST
-host=192.168.10.10
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-Latitude=50.000000
-id=junit-consumer-two
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPAAF
-AFT_ENVIRONMENT=AFTUAT
-limit=1000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+#consumer.properties file created on the fly for topic:JunitTopicOne on:1542997120526
+#Fri Nov 23 13:18:40 EST 2018
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=GET
+routeOffer=MR1
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+Version=1.0
+group=junit-client
+timeout=15000
+SubContextPath=/
+filter=none
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+Latitude=50.000000
+id=junit-consumer-two
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPAAF
+AFT_ENVIRONMENT=AFTUAT
+limit=1000
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
index 910e713..055e8cc 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/JunitTopicOne_junit-producer-one_producer.properties
@@ -1,35 +1,35 @@
-#producer.properties file created on the fly for topic:JunitTopicOne on:1534178854558
-#Mon Aug 13 09:47:34 PDT 2018
-AFT_DME2_EP_CONN_TIMEOUT=15000
-MethodType=POST
-password=admin
-DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
-Longitude=-100.000000
-username=admin
-partition=2
-Version=1.0
-maxBatchSize=100
-group=junit-client
-SubContextPath=/
-authDate=2016-07-20T11\:30\:56-0700
-filter=none
-authKey=01234567890abcde\:01234567890abcdefghijklmn
-Environment=TEST
-host=192.168.10.10
-Protocol=http
-Partner=BOT_R
-contenttype=application/json
-id=junit-producer-one
-Latitude=50.000000
-ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
-topic=JunitTopicOne
-TransportType=HTTPNOAUTH
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-AFT_DME2_REQ_TRACE_ON=true
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-MessageSentThreadOccurance=50
-maxAgeMs=250
+#producer.properties file created on the fly for topic:JunitTopicOne on:1542997120515
+#Fri Nov 23 13:18:40 EST 2018
+AFT_DME2_EP_CONN_TIMEOUT=15000
+MethodType=POST
+password=admin
+DME2preferredRouterFilePath=JunitTopicOnepreferredRoute.properties
+Longitude=-100.000000
+username=admin
+partition=2
+Version=1.0
+maxBatchSize=100
+group=junit-client
+SubContextPath=/
+authDate=2016-07-20T11\:30\:56-0700
+filter=none
+authKey=01234567890abcde\:01234567890abcdefghijklmn
+Environment=TEST
+host=192.168.10.10
+Protocol=http
+Partner=BOT_R
+contenttype=application/json
+id=junit-producer-one
+Latitude=50.000000
+ServiceName=dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+topic=JunitTopicOne
+TransportType=HTTPNOAUTH
+AFT_ENVIRONMENT=AFTUAT
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+AFT_DME2_REQ_TRACE_ON=true
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+MessageSentThreadOccurance=50
+maxAgeMs=250
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
index 7291e46..ca551c6 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapConsumerImpl.java
@@ -36,6 +36,7 @@
 import java.util.Properties;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.appc.adapter.message.Consumer;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
 import org.onap.appc.configuration.Configuration;
 import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.appc.metricservice.MetricRegistry;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
index e86ca97..445f919 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapProducerImpl.java
@@ -37,6 +37,7 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.appc.adapter.message.Producer;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
 import org.onap.appc.configuration.Configuration;
 import org.onap.appc.configuration.ConfigurationFactory;
 import org.onap.appc.metricservice.MetricRegistry;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapUtil.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
similarity index 96%
rename from appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
rename to appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
index 72e0a26..7e5f158 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/impl/DmaapUtil.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/java/org/onap/appc/adapter/messaging/dmaap/utils/DmaapUtil.java
@@ -21,7 +21,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,8 +32,8 @@
 
 import org.onap.appc.configuration.Configuration;
 import org.onap.appc.configuration.ConfigurationFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
 public class DmaapUtil {
 
@@ -41,7 +41,7 @@
 
     static final String         DMAAP_PROPERTIES_PATH = "org.onap.appc.dmaap.profile.path";
 
-    private static final Logger log                   = LoggerFactory.getLogger(DmaapUtil.class);
+    private static final EELFLogger log                = EELFManager.getInstance().getLogger(DmaapUtil.class);
 
     private DmaapUtil() {
     }
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
index 16cd5d8..3d50ea5 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/SimpleExamplePublisher.java
@@ -31,7 +31,7 @@
 
 import com.att.nsa.mr.client.MRConsumer;
 import org.json.JSONObject;
-import org.onap.appc.adapter.messaging.dmaap.impl.DmaapUtil;
+import org.onap.appc.adapter.messaging.dmaap.utils.DmaapUtil;
 
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/impl/TestDmaapUtil.java b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/utils/TestDmaapUtil.java
similarity index 99%
rename from appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/impl/TestDmaapUtil.java
rename to appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/utils/TestDmaapUtil.java
index 03e6191..1567242 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/impl/TestDmaapUtil.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/test/java/org/onap/appc/adapter/messaging/dmaap/utils/TestDmaapUtil.java
@@ -21,7 +21,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.appc.adapter.messaging.dmaap.impl;
+package org.onap.appc.adapter.messaging.dmaap.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
index 1d19a97..34e487c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
@@ -213,7 +213,7 @@
 						<Private-Package>org.onap.appc.dg.common.impl.*</Private-Package>
 						<Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*,
 							*;resolution:=optional</Import-Package>
-						<Embed-Dependency>appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
+						<Embed-Dependency>appc-dmaap-adapter-bundle,appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
 
 						<!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
 						<Embed-Transitive>true</Embed-Transitive>