Fix ColumnFamilyStoreTest, NativeCellTest, SSTableMetadataTest unit tests on 2.1

Patch by Benedict Elliott Smith; reviewed by Michael Shuler for CASSANDRA-7201
Merge branch 'cassandra-2.1' into trunk