Port of 39849_controller_sorts to EE

Mario de la Ossarequested to merge
ee-39849_controller_sorts into master

What does this MR do?

porting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21438 to resolve conflicts

Merge request reports