Merge remote-tracking branch 'origin/4.3.x' Signed-off-by: Olga Maciaszek-Sharma <[email protected]> # Conflicts: # docker/spring-cloud-contract-docker/project/gradle.properties # pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties