fix some bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	kvstore/test/kvstore/TPCEndToEndTest.java