Merge remote-tracking branch 'origin/appendonly' into appendonly

Conflicts:
	src/test/java/com/ctriposs/simplecache/SimpleCachePerfTestA.java