Merge remote-tracking branch 'upstream/branch-1.0.2' into dev-up

# Conflicts:
#	docs/zh_CN/1.0.4-release.md
#	docs/zh_CN/SUMMARY.md
#	escheduler-alert/pom.xml
#	escheduler-api/pom.xml
#	escheduler-common/pom.xml
#	escheduler-dao/pom.xml
#	escheduler-rpc/pom.xml
#	escheduler-server/pom.xml
#	pom.xml