diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index f2597f5447..2af6e8d17a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -108,7 +108,7 @@
 		<route id="gfeVtecChangeNotification">
 			<from uri="jms-generic:topic:edex.alerts.vtec"/>
 			<doTry>
-				<bean ref="serializationUtil" method="transformFromThrift" />
+			    <bean ref="serializationUtil" method="transformFromThrift" />
 				<bean ref="vtecChangeListener" method="handleNotification" />
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
@@ -130,7 +130,7 @@
 			</doTry>
 		</route>
 	</camelContext>
-
+	
 	<!-- Beans to define a custom jms connection which will allow a durable subscription -->
 	<bean id="gfeNotifyConnectionFactory" class="org.apache.qpid.client.AMQConnectionFactory">
        <constructor-arg type="java.lang.String" value="amqp://guest:guest@gfeNotify/edex?brokerlist='tcp://${broker.addr}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
index 69820fe074..5a00bce173 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
@@ -62,7 +62,7 @@
 				<pipeline>
 					<bean ref="stringToFile" />
 					<bean ref="satelliteDecoder" method="decode" />
-						<to uri="directvm:persistIndexAlert" />
+					<to uri="directvm:persistIndexAlert" />
 				</pipeline>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so b/nativeLib/org.apache.qpid/lib/libqpidclient.so
deleted file mode 120000
index be7a476349..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidclient.so
+++ /dev/null
@@ -1 +0,0 @@
-libqpidclient.so.4.0.0
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so b/nativeLib/org.apache.qpid/lib/libqpidclient.so
new file mode 100644
index 0000000000..a605493071
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidclient.so differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 b/nativeLib/org.apache.qpid/lib/libqpidclient.so.4
deleted file mode 120000
index be7a476349..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4
+++ /dev/null
@@ -1 +0,0 @@
-libqpidclient.so.4.0.0
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 b/nativeLib/org.apache.qpid/lib/libqpidclient.so.4
new file mode 100644
index 0000000000..a605493071
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidclient.so.4 differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so b/nativeLib/org.apache.qpid/lib/libqpidcommon.so
deleted file mode 120000
index dd3f10f6f5..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidcommon.so
+++ /dev/null
@@ -1 +0,0 @@
-libqpidcommon.so.4.0.0
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so b/nativeLib/org.apache.qpid/lib/libqpidcommon.so
new file mode 100644
index 0000000000..118b5274db
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidcommon.so differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 b/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
deleted file mode 120000
index dd3f10f6f5..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
+++ /dev/null
@@ -1 +0,0 @@
-libqpidcommon.so.4.0.0
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 b/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
new file mode 100644
index 0000000000..118b5274db
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidcommon.so.4 differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so
deleted file mode 120000
index 4effa60ca2..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so
+++ /dev/null
@@ -1 +0,0 @@
-libqpidmessaging.so.3.0.2
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so
new file mode 100644
index 0000000000..a1a4dfc0a8
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
deleted file mode 120000
index 4effa60ca2..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
+++ /dev/null
@@ -1 +0,0 @@
-libqpidmessaging.so.3.0.2
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
new file mode 100644
index 0000000000..a1a4dfc0a8
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3 differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so b/nativeLib/org.apache.qpid/lib/libqpidtypes.so
deleted file mode 120000
index 5e9777f8f0..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidtypes.so
+++ /dev/null
@@ -1 +0,0 @@
-libqpidtypes.so.1.1.1
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so b/nativeLib/org.apache.qpid/lib/libqpidtypes.so
new file mode 100644
index 0000000000..dac2b637df
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidtypes.so differ
diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 b/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
deleted file mode 120000
index 5e9777f8f0..0000000000
--- a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libqpidtypes.so.1.1.1
\ No newline at end of file
diff --git a/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 b/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
new file mode 100644
index 0000000000..dac2b637df
Binary files /dev/null and b/nativeLib/org.apache.qpid/lib/libqpidtypes.so.1 differ