Merge pull request #2822 from marc1706/ticket/12886

[ticket/12886] Remove obsolete check for f_user_lock

* marc1706/ticket/12886:
  [ticket/12886] Remove obsolete check for f_user_lock
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12886] Remove obsolete check for f_user_lock