Add remote proxy to feature. Remove old dependencies.

Change-Id: I65a0646937fc5ef107daa8657fd31fff7ea72389
Signed-off-by: Watson, Gregory <g.watson@computer.org>
diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index 2df242a..73f23de 100644
--- a/org.eclipse.ptp.product-feature/feature.xml
+++ b/org.eclipse.ptp.product-feature/feature.xml
@@ -148,32 +148,13 @@
          id="org.eclipse.ptp.rdt.sync.fortran"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.cvs"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.cdt.platform"/>
-      <import feature="org.eclipse.cdt"/>
-      <import feature="org.eclipse.cdt.autotools"/>
-      <import feature="org.eclipse.cdt.debug.ui.memory"/>
-      <import feature="org.eclipse.cdt.core.parser.upc.feature"/>
-      <import feature="org.eclipse.cdt.xlc.feature"/>
-      <import feature="org.eclipse.cdt.bupc"/>
-      <import feature="org.eclipse.cdt.mylyn"/>
-      <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.mylyn.context_feature"/>
-      <import feature="org.eclipse.mylyn.team_feature"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.bugzilla_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
-      <import feature="org.eclipse.rse"/>
-      <import feature="org.eclipse.jgit"/>
-      <import feature="org.eclipse.wst.xml_ui.feature"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-   </requires>
+   <includes
+         id="org.eclipse.remote.proxy"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.remote.console"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ptp.core"
@@ -225,34 +206,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.remote.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.jsch.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.jsch.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.ptp.ems.core"
          download-size="0"
          install-size="0"