Merge "Simplify User management settings to bare minimum" into jb-mr1-dev