Merge branch '1232-rendezvous-poller-cleanup' into 'master'

Small cleanups for rendezvous poller

See merge request !1126
1 job for master in 7 minutes and 34 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #3575
test

00:07:34