Merge branch 'hotfix_1.10_4.0.x_30028' into 1.10_release_4.0.x

# Conflicts:
#	flinkx-test/pom.xml

Author: kanata163

flinkx-test/pom.xml

@@ -12,7 +12,6 @@
     <artifactId>flinkx-test</artifactId>
 
     <properties>
-        <flink.version>1.10.0</flink.version>
         <prometheus.version>0.3.0</prometheus.version>
     </properties>