admin-role - static type for Role self_role and locked
Merge pull request #3102 from thomasmckay/admin-role

admin-role - static type for Role self_role and locked