Merge "Bug 530465 - make org.eclipse.wst.server_ui.feature REQUIRE org.eclipse.wst.server_core.feature instead of INCLUDING it, so we don't get two versions in the aggregate update site"