Please squash merge this PR

Description

Update the permission scopes on the User model to account for ACL roles in addition to legacy roles.

[X] I have performed a self-review of my code
[X] I have run the code that is being changed under ideal conditions, and it doesn't fail
[X] My code includes comments and/or descriptive variable names to help other engineers understand the intent (or not applicable)
[X] My code follows the style guidelines of this project (rubocop)
[ ] I have updated the documentation (or not applicable)
[ ] If it's not obvious how to test this change, I have provided testing instructions in this PR or the related issue