Merge branch 'develop' into dev/mix20191225_security

pom.xml

@@ -54,7 +54,7 @@
         <druid.version>1.1.21</druid.version>
         <swagger.version>2.9.2</swagger.version>
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
-        <logstash.version>5.3</logstash.version>
+        <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
         <aggregator.version>1.1.0</aggregator.version>
         <okhttp.version>4.2.2</okhttp.version>