Resolve remaining CE to EE differences in lib/

What does this MR do?

This is the CE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10430, moving some EE changes into CE.

What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/9505

Does this MR meet the acceptance criteria?

• Tests added for this feature/bug
• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides