[CE port] Revert "Automatic merge of gitlab-org/gitlab-ce master"

What does this MR do?

I can't cherry pick the https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9695 commit directly, so I found the merge requests from the reverted changelogs and reverted all 3 of them in this MR and reverted all 4 of them in this MR.

• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25416
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25201
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24960
• https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25517

This has allowed ee-specific-lines-check to pass in the EE MR.

What are the relevant issue numbers?

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

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated via this MR
• Documentation reviewed by technical writer or follow-up review issue created
• Tests added for this feature/bug
• Tested in all supported browsers
• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.
• Security reports checked/validated by reviewer