Merge remote-tracking branch 'origin/master' into 2.0.x

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/SecurityContextConcurrencyStrategy.java

@@ -21,6 +21,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import com.netflix.hystrix.HystrixThreadPoolProperties;
 import org.springframework.security.concurrent.DelegatingSecurityContextCallable;
 
 import com.netflix.hystrix.HystrixThreadPoolKey;
@@ -68,6 +69,13 @@ public class SecurityContextConcurrencyStrategy extends HystrixConcurrencyStrate
 						keepAliveTime, unit, workQueue);
 	}
 
+	@Override
+	public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolProperties threadPoolProperties) {
+		return existingConcurrencyStrategy != null
+				? existingConcurrencyStrategy.getThreadPool(threadPoolKey, threadPoolProperties)
+				: super.getThreadPool(threadPoolKey, threadPoolProperties);
+	}
+
 	@Override
 	public <T> Callable<T> wrapCallable(Callable<T> callable) {
 		return existingConcurrencyStrategy != null