Merge remote-tracking branch 'upstream/1.x' into 1.x

spring-cloud-alibaba-dependencies/pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <sentinel.version>1.3.0-GA</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <nacos.version>0.3.0</nacos.version>
+        <nacos.version>0.4.0</nacos.version>
         <acm.version>1.0.8</acm.version>
         <ans.version>0.1.1</ans.version>
         <aliyun.sdk.version>4.0.1</aliyun.sdk.version>