improved handling of multiple extension points org.eclipse.core.runtime.applications
Merge origin/master