LPS-38440 Use the proper groupId when getting the site locales
LPS-33738 Fix annotation removing trailing comma