Make package consistent with EPP

Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index 066c8f8..dc3aaba 100644
--- a/org.eclipse.ptp.product-feature/feature.xml
+++ b/org.eclipse.ptp.product-feature/feature.xml
@@ -72,39 +72,43 @@
 
    <includes
          id="org.eclipse.linuxtools.cdt.libhover.feature"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.linuxtools.changelog.c"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.linuxtools.gprof.feature"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.linuxtools.oprofile.feature"
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.linuxtools.rpm"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.linuxtools.systemtap"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.linuxtools.callgraph.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.linuxtools.valgrind"
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.linuxtools.gcov"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         version="0.0.0"/>
 
    <includes
-         id="org.eclipse.linuxtools.lttng2"
-         version="0.0.0"
-         optional="true"
-         search-location="both"/>
+         id="org.eclipse.linuxtools.lttng2.control"
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.photran"