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