Ninja fix for CASSANDRA-7245
Merge branch 'cassandra-2.1' into trunk