Bug 516347 - Fails to build against latest Oxygen I-builds

Change-Id: I371b2347252a53dfa35b1509599120e5e941a2a3
Signed-off-by: Mat Booth <mat.booth@redhat.com>

org.eclipse.epp.mpc-target/staging.target

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="MPC Target Platform - Staging" sequenceNumber="6">
+<?pde version="3.8"?><target name="MPC Target Platform - Staging" sequenceNumber="7">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7-I-builds"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>

org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF

@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.equinox.ds;bundle-version="1.4.100",
  org.eclipse.userstorage;bundle-version="[1.0.1,1.2.0)",
  org.eclipse.userstorage.ui;bundle-version="[1.0.0,1.2.0)",
- org.eclipse.ui.ide;bundle-version="3.12.0",
+ org.eclipse.ui.ide;bundle-version="3.13.0",
  org.eclipse.core.resources
 Export-Package: org.eclipse.epp.internal.mpc.ui;x-internal:=true,
  org.eclipse.epp.internal.mpc.ui.actions;x-internal:=true,

org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/AskMarketPlaceForFileSupportStrategy.java

@@ -34,7 +34,7 @@
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
-import org.eclipse.ui.internal.ide.SystemEditorOrTextEditorStrategy;
+import org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy;
 import org.eclipse.ui.internal.registry.EditorRegistry;
 import org.eclipse.ui.internal.registry.FileEditorMapping;
 import org.eclipse.ui.progress.UIJob;