Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev