Merge branch '1.5.x' into 2.0.x

Author: wilkinsona

spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml

@@ -14,7 +14,7 @@
 		<main.basedir>${basedir}/../../..</main.basedir>
 		<glassfish.version>4.1.1</glassfish.version>
 		<cargo.container.id>glassfish4x</cargo.container.id>
-		<cargo.container.url>http://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>
+		<cargo.container.url>https://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>
 	</properties>
 	<dependencies>
 		<dependency>