Fix sstable_gen.l.t with help from Marcus on CASSANDRA-7013
Merge branch 'master' of github.com:riptano/cassandra-dtest