Unify some admin controllers
What does this MR do?
Bring changes from EE
Are there points in the code the reviewer needs to double check?
EE at: gitlab-ee!6267 (merged)
Does this MR meet the acceptance criteria?
- Tests added for this feature/bug
- Conform by the code review guidelines
- Has been reviewed by a Backend maintainer