Pair erin
Merge branch 'workloadConsistencyTest' of github.com:thuys/YCSB-1 into workloadConsistencyTest

Conflicts:
	core/src/main/java/com/yahoo/ycsb/measurements/ConsistencyOneMeasurement.java