Merge pull request #485 from jghiloni/master

* pull485:
  Make `isSecure()` match `getPort()` in secure vs non-secure resolution

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

@@ -121,7 +121,8 @@ public class EurekaDiscoveryClient implements DiscoveryClient {
 
 		@Override
 		public boolean isSecure() {
-			return this.instance.isPortEnabled(SECURE);
+			// assume if unsecure is enabled, that is the default
+			return !this.instance.isPortEnabled(UNSECURE) && this.instance.isPortEnabled(SECURE);
 		}
 
 		@Override