Revert "Merge branch 'revert-82d7b5a0' into 'master'"

What does this MR do?

CE port: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25547

This cherry-picks 3 merge commits that were reverted by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25537:

• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25416 => 4b282e9c
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24960 => d133bf84 + a fix (06af6156).
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25517 => 9202bbd1

Note: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25201 isn't cherry-picked since it introduces a N+1 queries problem in EE (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9704#note_145071430).

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• EE specific content should be in the top level /ee folder
• Security reports checked/validated by reviewer