Core/RBAC: Fix errors in RBAC sql related to ea2fe0217d