Merge "User restrictions for creds storage & user removal" into jb-mr2-dev