CASSANDRA-6916 followup, make sure offline split works
Merge branch 'cassandra-2.1' into trunk