Merge branch 'cassandra-4.0' into cassandra-4.1

* cassandra-4.0:
  Fix the ordering of sstables when running sstableupgrade tool