LPS-35071 Fix and add new properly named tokens and context vars
LPS-35071 Rename groupId param to articleGroupId because that's what it really is, to avoid anyone making the same mistake again.
LPS-35071 Don't we want to pass siteGroupId in both code blocks?
LPS-35071 SF