Ninja: fix bad merge of CASSANDRA-7804
Merge branch 'cassandra-2.1' into trunk