Merge "Rename limited user to restricted profile" into jb-mr2-dev