Olga Maciaszek-Sharma
8a7eaec6e1
Merge branch '2.1.x'
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-consul-binder/pom.xml
# spring-cloud-consul-config/pom.xml
# spring-cloud-consul-core/pom.xml
# spring-cloud-consul-dependencies/pom.xml
# spring-cloud-consul-discovery/pom.xml
# spring-cloud-consul-sample/pom.xml
# spring-cloud-starter-consul-all/pom.xml
# spring-cloud-starter-consul-bus/pom.xml
# spring-cloud-starter-consul-config/pom.xml
# spring-cloud-starter-consul-discovery/pom.xml
# spring-cloud-starter-consul/pom.xml