Merge remote-tracking branch 'origin/petrochina-xjzd-release' into petrochina-xjzd-release

# Conflicts:
#	pom.xml
#	src/test/java/com/gct/tools/etlcamelhuge/EtlCamelHugeApplicationTests.java