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

Use periodic poll task for expiry

See merge request !1127
1 job for master in 9 minutes and 5 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3583
test

00:09:05