Merge branch 'wip/timed-login-fix' into 'master'

address timedlogin bug leading to wrong session getting unlocked

Closes #460

See merge request !58
1 job for master in 4 minutes and 57 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #209018
build-fedora

00:04:57