fix attempting to flush empty rows
patch by jbellis; reviewed by jasobrown for CASSANDRA-6374
Merge branch 'cassandra-2.0' into trunk