ninja change default back to heap_buffers
Merge branch 'cassandra-2.1' into trunk