EE port of discussion-perf-fixes

What does this MR do?

EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22935

Does this MR meet the acceptance criteria?

Merge request reports

Loading