* Remove invalid import

* Remove invalid line

* Move Ribbon to its own module. Fixes #2299

* Add logging to RibbonLoadBalancerRetryPolicy

set proper status and health eureka urls if prefer ip address is set

* Adding protected getter to obtain CompositeHealthIndicator. This allows subclasses to obtain this indicator's health details map which is useful for error reporting.

* fix wrong sentence.

fixes no class def found error

This fixes problems in testing while maintaining backwards compatibility.

Allows upgrade of zuul to 1.3.1

This reverts commit 348d1c5b.

public FeignLoadBalancer.RibbonRequest and FeignLoadBalancer.RibbonResponse to the user to customize their needs (#2536)

* Added util method to upgrade the connection to a secure one.

- Adds support for websocket URIs
- Fixes bug where a non-secure scheme other than http would be changed to https
- Deprecated `updateToHttpsIfNeeded` in favor of `updateToSecureConnectionIfNeeded`

* Expect http when no scheme was set

* Skip update to secure connection when the uri is empty

Change spring-cloud-starter-hystrix-netflix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard (#2560)

Change spring-cloud-starter-hystrix-netflix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard

Change spring-cloud-starter-hystrix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard (#2561)

Change spring-cloud-starter-hystrix-dashboard to spring-cloud-starter-netflix-hystrix-dashboard

Fixes gh-808.

* InputStream should always be closed after reading contents from upstreams

Fixes gh-2421

Fixes #2513

* Fixes double encoding when creating secure URLs.  Fixes #2478.

* Adjust the code format