Merge branch 'develop' of github.com:eclipse/paho.mqtt.java into develop

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/TCPNetworkModule.java

@@ -80,6 +80,7 @@ public void start() throws IOException, MqttException {
 				socket = factory.createSocket();
 				socket.connect(sockaddr, conTimeout*1000);
 			}
+			socket.setSoTimeout(1000);
 		}
 		catch (ConnectException ex) {
 			//@TRACE 250=Failed to create TCP socket

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java

@@ -83,7 +83,8 @@ public void start() throws IOException, MqttException {
 				socket = factory.createSocket();
 				socket.connect(sockaddr, conTimeout*1000);
 			}
-		
+			socket.setSoTimeout(1000);
+
 			// SetTcpNoDelay was originally set ot true disabling Nagle's algorithm.
 			// This should not be required.
 //			socket.setTcpNoDelay(true);	// TCP_NODELAY on, which means we do not use Nagle's algorithm