Binaries v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
index 62a239f..1854ee5 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
index 7150040..48259f2 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
index 4b71afe..771737a 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
index f600183..aba6ae2 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
index f23a3d7..147f509 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
index 56ff11b..c5a3888 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
@@ -13,4 +13,4 @@
                about.html
                
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
index 3458c29..271bc83 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
@@ -13,4 +13,4 @@
                about.html
 
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
index 93fe8dc..4fa7039 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
index 829adda..9d8ec7e 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
index d5b4f94..fca27c1 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
@@ -13,4 +13,4 @@
                about.html
                
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
index 64034b8..a35a151 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
index d175a44..f29510c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
index dd2ad8e..d05857c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
index 7def8d4..167379b 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties
index e35bab6..9af7fd6 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties
@@ -14,4 +14,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
index 56fdcd9..2aefdd3 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
index 2f4594b..6346efb 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
@@ -13,4 +13,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
index 5b5b060..3389511 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
@@ -13,4 +13,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
index c30e684..1941f11 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
@@ -13,4 +13,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20161213-1256
+binaryTag=v20170410-1100
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 6813773..ec35a1b 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -86,13 +86,15 @@
 		
 		<resolveProperty name="machine" value="m_${os}.${arch}" />
 		<script language="javascript">
-			a = project.getProperty('machine').split(':');
-
-			project.setProperty('machine', a[0]);
-			if ( a[1] == null ) {
-				project.setProperty('port', '22');
-			} else {
-				project.setProperty('port', a[1]);
+			a = project.getProperty('machine');
+			if (a != null) {
+				a = a.split(':');
+				project.setProperty('machine', a[0]);
+				if ( a[1] == null ) {
+					project.setProperty('port', '22');
+				} else {
+					project.setProperty('port', a[1]);
+				}
 			}
 		</script>