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

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicSSLTest.java

@@ -372,7 +372,7 @@ public void testNonSSLtoSSLChannel() throws Exception {
    * Try ssl connection to channel without ssl
    * @throws Exception
    */
-  @Test(timeout=30000)
+  @Test(timeout=60000)
   public void testSSLtoNonSSLChannel() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);