Revert "Bug 511517: 11 test errors in SearchCheatsheet since I20170201-1030"

This reverts commit d19215a5ae3190b86b13d9ce52f1ca6166df5ece.
diff --git a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
index d3d6a5d..818d64c 100644
--- a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
  org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.help.ui;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.200"
 Eclipse-LazyStart: true
diff --git a/org.eclipse.ui.intro/META-INF/MANIFEST.MF b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
index 1ea79b6..bd504d4 100644
--- a/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@
  org.eclipse.ui.intro.contentproviders
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="3.4.200",