Merge branch '4.1.0-SNAPSHOT' of http://git.jd.com/laf/journalQ into 4.1.0-SNAPSHOT

# Conflicts:
#	docs/cn/rest_api.md

Author: gaohaoxiang

pom.xml

@@ -42,7 +42,7 @@
         <commons-cli.version>1.4</commons-cli.version>
         <httpclient.version>4.5.2</httpclient.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
-        <jackson-databind.version>2.9.9.1</jackson-databind.version>
+        <jackson-databind.version>2.9.4</jackson-databind.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <hibernate-validator.version>5.3.0.Final</hibernate-validator.version>
         <el.version>2.2.4</el.version>