xxx
Merge remote-tracking branch 'origin/5.0.x' into 5.0.x

Conflicts:
	dbscript/oracle/01basisScript/operator/initdata/INIT_OPER_OPERATOR.sql