HCD-122 Backports CASSANDRA-20368 and CASSANDRA-20450

[tiagomlalves]

What is the issue

Work done in HCD-82 was further refined in CASSANDRA-20368 and CASSANDRA-20450.

What does this PR fix and why was it fixed

This backports C* changes in order to minimize the diff in future backports.

[github-actions]

Checklist before you submit for review

• Make sure there is a PR in the CNDB project updating the Converged Cassandra version
• Use NoSpamLogger for log lines that may appear frequently in the logs
• Verify test results on Butler
• Test coverage for new/modified code is > 80%
• Proper code formatting
• Proper title for each commit staring with the project-issue number, like CNDB-1234
• Each commit has a meaningful description
• Each commit is not very long and contains related changes
• Renames, moves and reformatting are in distinct commits

[cassci-bot]

❌ Build ds-cassandra-pr-gate/PR-1647 rejected by Butler

---

2 new test failure(s) in 1 builds
See build details here

---

Found 2 new test failures

Test	Explanation	Branch history	Upstream history
...testWithRangeTombstoneMarkersWithoutCompression	regression	🔴	🔵🔵🔵🔵🔵🔵🔵
o.a.c.u.b.BinLogTest.testTruncationReleasesLogS...	regression	🔴	🔵🔵🔵🔵🔵🔵🔵

---

No known test failures found