Merge "Upgrade springfox to version 2.10.5"