SOS-1820 remove UpgradeGroup. Should be split into upgradeLayoutSet and upgradeLayout
SOS-1820 Add UpgradeLayout, UpgradeLayoutSet, UpgradeTheme
SOS-1820 Sort
SOS-1820 SF
LPS-41113 Fix compile