Normalize with cpp package.

Change-Id: Id20545f8ee3b76a6364075d80c27cb7439176b9b
Signed-off-by: Greg Watson <g.watson@computer.or
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
index 44c14a8..28e8102 100644
--- a/packages/org.eclipse.epp.package.parallel.product/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -20,24 +20,18 @@
       </programArgs>
       <vmArgs>-Dosgi.requiredJavaVersion=1.8
 -Dosgi.instance.area.default=@user.home/eclipse-workspace
---add-modules=ALL-SYSTEM
-      </vmArgs>
-      <vmArgsLin>-Xms512m
--Xmx2048m
--XX:+UseG1GC
--XX:+UseStringDeduplication
-      </vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread
 -Xms512m
 -Xmx2048m
 -XX:+UseG1GC
 -XX:+UseStringDeduplication
+--add-modules=ALL-SYSTEM
+      </vmArgs>
+      <vmArgsLin>
+      </vmArgsLin>
+      <vmArgsMac>-XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Xms512m
--Xmx1024m
--XX:+UseG1GC
--XX:+UseStringDeduplication
+      <vmArgsWin>
       </vmArgsWin>
    </launcherArgs>
 
@@ -202,12 +196,15 @@
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.cdt" installMode="root"/>
       <feature id="org.eclipse.cdt.autotools" installMode="root"/>
+      <feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
+      <feature id="org.eclipse.cdt.cmake" installMode="root"/>
       <feature id="org.eclipse.cdt.bupc" installMode="root"/>
       <feature id="org.eclipse.cdt.core.parser.upc.feature" installMode="root"/>
+      <feature id="org.eclipse.cdt.debug.standalone" installMode="root"/>
       <feature id="org.eclipse.cdt.debug.ui.memory" installMode="root"/>
+      <feature id="org.eclipse.cdt.launch.remote" installMode="root"/>
+      <feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
       <feature id="org.eclipse.cdt.mylyn" installMode="root"/>
-      <feature id="org.eclipse.cdt.platform" installMode="root"/>
-      <feature id="org.eclipse.cdt.xlc.feature" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>