Adding CASSANDRA-6244 to our patched build