Maintain alphabetical order of service definitions
Merge pull request #5169
Merge pull request #5169 in master