CASSANDRA-7635, rebase for 2.1