Merge "Fix deadlock in removing a user" into jb-mr1-dev