Sync 3.4.2 GA code to R3_4_maintenance stream

plugins/org.eclipse.jst.server.generic.jboss/build.properties

diff --git a/plugins/org.eclipse.jst.server.generic.jboss/build.properties b/plugins/org.eclipse.jst.server.generic.jboss/build.properties
index a57ae49..6271748 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.jboss/build.properties
@@ -15,6 +15,5 @@
                icons/,\
                buildfiles/,\
                genericjboss.jar              
-src.includes = build.properties
 source.genericjboss.jar = servers/
 jars.compile.order = genericjboss.jar

plugins/org.eclipse.jst.server.generic.jonas/build.properties

diff --git a/plugins/org.eclipse.jst.server.generic.jonas/build.properties b/plugins/org.eclipse.jst.server.generic.jonas/build.properties
index 39aa983..179f110 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.jonas/build.properties
@@ -15,6 +15,5 @@
                servers/,\
                buildfiles/,\
                genericjonas.jar
-src.includes = build.properties
 jars.compile.order = genericjonas.jar
 source.genericjonas.jar = servers/

plugins/org.eclipse.jst.server.generic.oc4j/build.properties

diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/build.properties b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
index 1a01b25..ca37d55 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/build.properties
@@ -15,6 +15,5 @@
                plugin.properties,\
                servers/,\
                genericoc4j.jar
-src.includes = build.properties
 source.genericoc4j.jar = servers/
 jars.compile.order = genericoc4j.jar

plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java

diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java
index 60332e2..9e5bcd4 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PingThread.java
@@ -84,6 +84,7 @@
 				Trace.trace(Trace.FINEST, "Ping: pinging " + count);
 				URL pingUrl = new URL(url);
 				URLConnection conn = pingUrl.openConnection();
+				((HttpURLConnection)conn).setInstanceFollowRedirects(false);
 				((HttpURLConnection)conn).getResponseCode();
 	
 				// ping worked - server is up