Olga MaciaszekSharma
925254e957
Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
# docs/pom.xml
# docs/src/main/asciidoc/_configprops.adoc
# 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-integration-tests/spring-cloud-consul-bootstrap-tests/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