reset offheap gc test parameters
fix merge of cassandra.yaml