Merge pull request #6572 from mpg/improve-test-suites-listing-2.28

[backport 2.28] Improve test suite detection in run-test-suites.pl