DSP-1655 Backport CASSANDRA-5284

Second commit is just to add a JIRA specific version for testing, it should be dropped when merging