Merge "Enable user management in Settings for Manta" into jb-mr1-dev