diff --git a/.gitignore b/.gitignore
index 9df3ab04..4500f63c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ _site/
 *.iml
 .idea
 .factorypath
+/spring-cloud-release-tools*.jar
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
index 4e060972..baf12347 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
@@ -16,6 +16,7 @@ import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ClassUtils;
 
 /**
  * Spring Boot Auto-Configuration for Simple Properties based Discovery Client
@@ -60,11 +61,15 @@ public class SimpleDiscoveryClientAutoConfiguration {
 
 	private int findPort() {
 		//FIXME: is what is the boot 2.0 equiv?
-		/*if (this.context instanceof EmbeddedWebApplicationContext) {
-			EmbeddedServletContainer container = ((EmbeddedWebApplicationContext) this.context)
-					.getEmbeddedServletContainer();
-			if (container != null) {
-				return container.getPort();
+		/*if (ClassUtils.isPresent(
+				"org.springframework.boot.context.embedded.EmbeddedWebApplicationContext",
+				null)) {
+			if (this.context instanceof EmbeddedWebApplicationContext) {
+				EmbeddedServletContainer container = ((EmbeddedWebApplicationContext) this.context)
+						.getEmbeddedServletContainer();
+				if (container != null) {
+					return container.getPort();
+				}
 			}
 		}*/
 		if (this.server != null && this.server.getPort() != null