cleanup RDCSS a bit and port to latest CmpXchg

1 job for master in 19 minutes and 21 seconds
Status Job ID Name Coverage
  Build
passed #35457
fp
build-iris.dev

00:19:21