Merge origin/master

Conflicts:
	CHDB/db.lck
	CHDB/log/log.ctrl
	CHDB/log/logmirror.ctrl
	CHDB/seg0/cbd1.dat
	CHDB/seg0/cbe1.dat
	derby.log
Merge origin/master