LPS-49393 Correct the service builder package exports generated for WABs
LPS-49393 Sort