Merge branch 'cassandra-3.11' into cassandra-4.0

* cassandra-3.11:
  Backport CASSANDRA-16418 to 3.x