Merge branch 'cassandra-5.0' into trunk

* cassandra-5.0:
  Minor bugs in generate.sh -d