Merged branch 'develop' into 'master'

# Manual update of:
#	build/org.eclipse.app4mc.target/PHOTON/_gen/_photon_platform_others_latest.target
#	build/org.eclipse.app4mc.target/PHOTON/app4mc_addon_migration.tpd
diff --git a/build/org.eclipse.app4mc.target/PHOTON/_gen/_photon_platform_others_latest.target b/build/org.eclipse.app4mc.target/PHOTON/_gen/_photon_platform_others_latest.target
index 995b839..2e471b6 100644
--- a/build/org.eclipse.app4mc.target/PHOTON/_gen/_photon_platform_others_latest.target
+++ b/build/org.eclipse.app4mc.target/PHOTON/_gen/_photon_platform_others_latest.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Photon-Platform" sequenceNumber="1576661109">
+<target name="Photon-Platform" sequenceNumber="1580484788">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.0.v20180512-1128"/>
@@ -88,12 +88,12 @@
       <repository location="http://download.eclipse.org/ease/update/release"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.8.201909101346"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.8.201909101346"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.8.201909101346"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.8.201909101346"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.8.201909101346"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.8.201909101346"/>
+      <unit id="org.eclipse.emf.compare.feature.group" version="3.3.9.201911051515"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.3.9.201911051515"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.9.201911051515"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="3.3.9.201911051515"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.9.201911051515"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/>
       <repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
@@ -228,7 +228,7 @@
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.app4mc.amalthea.converters.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.app4mc.amalthea.converters.sdk.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/app4mc/components/addon/migration/snapshot/p2repo"/>
+      <repository location="http://download.eclipse.org/app4mc/components/addon/migration/releases/0.9.7/p2repo/"/>
     </location>
   </locations>
 </target>
diff --git a/build/org.eclipse.app4mc.target/PHOTON/app4mc_addon_migration.tpd b/build/org.eclipse.app4mc.target/PHOTON/app4mc_addon_migration.tpd
index fc8859f..e75c618 100644
--- a/build/org.eclipse.app4mc.target/PHOTON/app4mc_addon_migration.tpd
+++ b/build/org.eclipse.app4mc.target/PHOTON/app4mc_addon_migration.tpd
@@ -1,6 +1,6 @@
-target "APP4MC-Migration"
+target "cbi"
 
-location "http://download.eclipse.org/app4mc/components/addon/migration/snapshot/p2repo" {
+location "http://download.eclipse.org/app4mc/components/addon/migration/releases/0.9.7/p2repo/" {
 	
 	org.eclipse.app4mc.amalthea.converters.feature.group lazy
 	org.eclipse.app4mc.amalthea.converters.sdk.feature.group lazy