Merge branch '3.1.x' of github.com:freefair/okhttp-spring-boot into 3…

Merge branch '3.1.x' of github.com:freefair/okhttp-spring-boot into 3… #1207