Merge branch '4.1.x' into 4.2.x

Author: ryanjbaxter

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java

@@ -27,7 +27,7 @@
 import org.springframework.cloud.consul.ConsulAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Fail.fail;
 
 /**
  * @author Olga Maciaszek-Sharma