MDL-26017 Enrolments: Simplify keyholder capability