Merge "PortalAdminUserRole class DB constraints"