Merge branch '3.1.x' into 3.2.x

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -43,13 +43,6 @@
 							<goal>build-image-no-fork</goal>
 						</goals>
 					</execution>
-					<execution>
-						<id>repackage</id>
-						<phase>package</phase>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
 				</executions>
 			</plugin>