Bug 576490: re-enable feature that was disabled in simrel

This reverts commit b04c550.
and commit 6251171

Change-Id: Ib84e28ec88d6c8b2f99760f36cc48f1b61a6a49a

packages/org.eclipse.epp.package.committers.product/epp.product

@@ -243,7 +243,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.team_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.versions" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.swt.tools.feature" installMode="root"/>
       <feature id="org.eclipse.test" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.feature" installMode="root"/>

packages/org.eclipse.epp.package.cpp.product/epp.product

@@ -234,7 +234,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.linuxtools.rpm" installMode="root"/>
       <feature id="org.eclipse.linuxtools.valgrind" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature" installMode="root"/>
       <feature id="org.eclipse.tracecompass.gdbtrace" installMode="root"/>

packages/org.eclipse.epp.package.dsl.product/epp.product

@@ -210,7 +210,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.emf.ecore.xcore.sdk" installMode="root"/>
       <feature id="org.eclipse.emf.mwe2.language.sdk" installMode="root"/>
       <feature id="org.eclipse.emf.sdk" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.xtext.sdk" installMode="root"/>
       <feature id="org.eclipse.lsp4j.sdk" installMode="root"/>
    </features>

packages/org.eclipse.epp.package.embedcpp.product/epp.product

@@ -231,7 +231,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.linuxtools.rpm" installMode="root"/>
       <feature id="org.eclipse.linuxtools.valgrind" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature" installMode="root"/>
       <feature id="org.eclipse.tracecompass.gdbtrace" installMode="root"/>

packages/org.eclipse.epp.package.java.product/epp.product

@@ -217,7 +217,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext.editors_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.xml.feature" installMode="root"/>
       <feature id="org.eclipse.tips.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>

packages/org.eclipse.epp.package.jee.product/epp.product

@@ -283,7 +283,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.pde" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.wst.common.fproj" installMode="root"/>

packages/org.eclipse.epp.package.modeling.product/epp.product

@@ -226,7 +226,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.gmf.runtime.sdk" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.ocl.all.sdk" installMode="root"/>
       <feature id="org.eclipse.pde" installMode="root"/>
       <feature id="org.eclipse.sdk" installMode="root"/>

packages/org.eclipse.epp.package.parallel.product/epp.product

@@ -218,7 +218,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.ptp" installMode="root"/>
       <feature id="org.eclipse.ptp.debug.sdm" installMode="root"/>
       <feature id="org.eclipse.ptp.fortran" installMode="root"/>

packages/org.eclipse.epp.package.php.product/epp.product

@@ -215,7 +215,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.php" installMode="root"/>
       <feature id="org.eclipse.php.composer" installMode="root"/>
       <feature id="org.eclipse.php.mylyn" installMode="root"/>

packages/org.eclipse.epp.package.rcp.product/epp.product

@@ -220,7 +220,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.rap.tools.feature" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>

packages/org.eclipse.epp.package.scout.product/epp.product

@@ -216,7 +216,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
-      <!-- Bug 576490: Disable feature that is (hopefully temporarily) disabled in simrel <feature id="org.eclipse.oomph.setup" installMode="root"/> -->
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.scout.sdk-feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>