Issue #2694 Fix dependency issues in the build.

Change-Id: Ie0bc386851869bb0b7e56c117193c84e5fa03e91

Former-commit-id: c20a2f2e0d [formerly 6f530a08a2a823ce01ef66b8e10ff52d9626de3f]
Former-commit-id: 5e7a694eb7

edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml

@@ -183,4 +183,11 @@
          install-size="0"
          version="7.6.14.v20131031"/>
 
+   <plugin
+         id="com.raytheon.uf.common.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml

@@ -46,13 +46,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.raytheon.uf.common.json"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.datadelivery.retrieval"
          download-size="0"