Merge branch 'release/2.4'

# Conflicts:
#	rcpttTests/pom-base.xml
diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/internal/target/TargetPlatformHelper.java b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/internal/target/TargetPlatformHelper.java
index 1983e88..300a230 100644
--- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/internal/target/TargetPlatformHelper.java
+++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/internal/target/TargetPlatformHelper.java
@@ -24,7 +24,6 @@
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -405,12 +404,7 @@
 		}
 		List<URI> uris = new ArrayList<URI>();
 		for (TargetBundle bundle : bundles) {
-			try {
-				uris.add(new URL("file://"
-						+ bundle.getBundleInfo().getLocation().getPath()).toURI());
-			} catch (URISyntaxException | MalformedURLException e) {
-				Q7ExtLaunchingPlugin.getDefault().log(e);
-			}
+			uris.add(bundle.getBundleInfo().getLocation());
 		}
 
 		PDEState state = new PDEState(uris.toArray(new URI[uris