Another attempting at fixing CASSANDRA-7599
Update regex post-bikeshedding
Merge branch 'CASSANDRA-7599-fix-2'