Finalized synchronization.
Merge branch 'master' of https://github.com/nmldiegues/ycsb

Conflicts:
	src/main/java/com/yahoo/ycsb/Client.java