Merge branch 'cassandra-6.0' into trunk

* cassandra-6.0:
  Guardrail values of zero to mean literally zero