Merge remote-tracking branch 'origin/develop' into 84-integrate

pom.xml

@@ -16,6 +16,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
+            <version>${spring-boot-gateway.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>