Follow up on CASSANDRA-7189

fix hang when no CF name is given
Merge branch 'cassandra-2.1' into trunk