Merge remote-tracking branch 'origin/4.0.x'

Author: OlgaMaciaszek

Diff for: spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java

@@ -437,7 +437,7 @@ <T> T getTarget() {
 			if (LOG.isInfoEnabled()) {
 				LOG.info("For '" + name + "' URL not provided. Will try picking an instance via load-balancing.");
 			}
-			if (!name.startsWith("http")) {
+			if (!name.startsWith("http://") && !name.startsWith("https://")) {
 				url = "http://" + name;
 			}
 			else {
@@ -446,7 +446,7 @@ <T> T getTarget() {
 			url += cleanPath();
 			return (T) loadBalance(builder, feignClientFactory, new HardCodedTarget<>(type, name, url));
 		}
-		if (StringUtils.hasText(url) && !url.startsWith("http")) {
+		if (StringUtils.hasText(url) && !url.startsWith("http://") && !url.startsWith("https://")) {
 			url = "http://" + url;
 		}
 		Client client = getOptional(feignClientFactory, Client.class);