Replaced legacy variable substituion
Replaced environment group name with constituent groups
Merge branch 'add-desktop-packages'