Merge branch 'master' of https://github.com/zagfox/cse223p into tripod

Conflicts:
	lockstore/logplayer.go
merge
Merge branch 'master' of https://github.com/zagfox/cse223p into tripod
merge
Merge branch 'master' of https://github.com/zagfox/cse223p into tripod
???
v6.4 fix a bug in client acquire, waiting for msg