Merge branch 'dev' of ssh://github.com/shardingjdbc/sharding-jdbc into dev

# Conflicts:
#	pom.xml
#	sharding-orchestration/sharding-orchestration-reg/pom.xml
#	sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-etcd/pom.xml