[24.0] Fix usage of DISTINCT

[jdavcs]

Fixes #17737

The usage of DISTINCT requires that all columns appearing in the ORDER BY clause must also appear in the SELECT clause.

How to test the changes?

(Select all options that apply)

• I've included appropriate automated tests.
• This is a refactoring of components with existing test coverage.
• Instructions for manual testing are as follows:
  1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

• I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

[bgruening]

Thanks @jdavcs and @ahmedhamidawan !