AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>
diff --git a/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
index 18df807..c26a444 100644
--- a/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
@@ -14,11 +14,7 @@
   </context-param>
   <context-param>
     <param-name>mso.configuration</param-name>
-    <param-value>MSO_PROP_WORKFLOW_MESSAGE_ADAPTER=mso.workflow-message-adapter.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value>
-  </context-param>
-  <context-param>
-        <param-name>mso.cloud_config.configuration</param-name>
-        <param-value>cloud_config.json=2</param-value>
+    <param-value>MSO_PROP_WORKFLOW_MESSAGE_ADAPTER=mso.workflow-message-adapter.properties,MSO_PROP_TOPOLOGY=topology.properties,MSO_PROP_AAF=cadi.properties</param-value>
   </context-param>
   <context-param>
     <param-name>resteasy.resources</param-name>
@@ -28,6 +24,10 @@
         org.openecomp.mso.adapters.workflowmessage.WMAdapterRest
     </param-value>
   </context-param>
+  <context-param>
+    <param-name>resteasy.providers</param-name>
+    <param-value>org.openecomp.mso.adapters.providers.JettisonStyleMapperProvider</param-value>
+  </context-param>
   <servlet>
     <servlet-name>Resteasy</servlet-name>
     <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>