Fixed another conversion error between short and unsigned short.
Fixed failing test cases. AntiCacheManagerProfiler not working, so I disabled the test cases for now.
Fixed a few things with tuple-merge and cleaned up code.
Merge remote-tracking branch 'jdebrabant/master' into anticache
Revert changes tpcc.properties