second attempt to fix multi-threading issues
Merge branch 'composite-partitioning' of https://github.com/rytaft/h-store into composite-partitioning

Conflicts:
	src/frontend/edu/brown/hstore/reconfiguration/ReconfigurationUtil.java