6eec040
Update to upstream * Only call role_fix_callback for base.p_roles during expansion. * use mapped role number instead of module role number