Merge pull request #2418 from splitbrain/addUnittestDeleteUsers