Resolve #3332446 "Refactor claros system admin modules 11x"

Paul Sebbornrequested to merge
issue/drupal-3332446:3332446-refactor-claros-system-admin--modules-11x into main

Closes #3332446

Merge request reports