Merge branch 'develop-tmp'

# Conflicts:
#	kafka-client/pom.xml
#	kafka/pom.xml

deployer/src/main/resources/canal.properties

@@ -9,6 +9,8 @@ canal.zkServers=
 # flush data to zk
 canal.zookeeper.flush.period = 1000
 canal.withoutNetty = false
+# tcp, kafka, rocketMQ
+canal.serverMode = tcp
 # flush meta cursor/parse position to file
 canal.file.data.dir = ${canal.conf.dir}
 canal.file.flush.period = 1000