Ninja: fix bad merge of CASSANDRA-7804