Change hystrix command key to be the service ID in Zuul proxy

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java

@@ -97,7 +97,7 @@ public class RestClientRibbonCommand extends HystrixCommand<ClientHttpResponse>
 				.withExecutionIsolationStrategy(ExecutionIsolationStrategy.SEMAPHORE)
 				.withExecutionIsolationSemaphoreMaxConcurrentRequests(value.get());
 		return Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey("RibbonCommand"))
-				.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey + "RibbonCommand"))
+				.andCommandKey(HystrixCommandKey.Factory.asKey(commandKey))
 				.andCommandPropertiesDefaults(setter);
 	}
 
@@ -111,8 +111,8 @@ public class RestClientRibbonCommand extends HystrixCommand<ClientHttpResponse>
 		Builder builder = HttpRequest.newBuilder().verb(this.verb).uri(this.uri)
 				.entity(this.requestEntity);
 
-		if(retryable != null) {
-			builder.setRetriable(retryable);
+		if(this.retryable != null) {
+			builder.setRetriable(this.retryable);
 		}
 
 		for (String name : this.headers.keySet()) {
@@ -154,30 +154,30 @@ public class RestClientRibbonCommand extends HystrixCommand<ClientHttpResponse>
 	}
 
 	protected MultiValueMap<String, String> getHeaders() {
-		return headers;
+		return this.headers;
 	}
 
 	protected MultiValueMap<String, String> getParams() {
-		return params;
+		return this.params;
 	}
 
 	protected InputStream getRequestEntity() {
-		return requestEntity;
+		return this.requestEntity;
 	}
 
 	protected RestClient getRestClient() {
-		return restClient;
+		return this.restClient;
 	}
 
 	protected Boolean getRetryable() {
-		return retryable;
+		return this.retryable;
 	}
 
 	protected URI getUri() {
-		return uri;
+		return this.uri;
 	}
 
 	protected Verb getVerb() {
-		return verb;
+		return this.verb;
 	}
 }

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java

@@ -16,10 +16,12 @@
 
 package org.springframework.cloud.netflix.zuul.filters.route;
 
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
 import com.netflix.client.http.HttpRequest;
 import com.netflix.niws.client.http.RestClient;
+
 import lombok.SneakyThrows;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 
 /**
  * @author Spencer Gibb
@@ -45,7 +47,7 @@ public class RestClientRibbonCommandFactory implements RibbonCommandFactory<Rest
 	}
 
 	protected SpringClientFactory getClientFactory() {
-		return clientFactory;
+		return this.clientFactory;
 	}
 
 	protected static HttpRequest.Verb getVerb(String sMethod) {