Several corrections to service sorting to produce output consistent with user expectations. Fixes #8069
(cherry picked from commit 258fc75b0995a53997927edc5186b1fe8a5b409e)
Several corrections to service sorting to produce output consistent with user expectations. Fixes #8069
(cherry picked from commit 258fc75b0995a53997927edc5186b1fe8a5b409e)