LPS-47470 Prevent BaseUpgradePortletPreferences from deleting archived setups when upgrading.
LPS-47470 Prevent an infinite recursion in ArchivedSettingsImpl when trying to iterate the modified keys
LPS-47470 Reset service keys from archived setups when upgrading
LPS-47470 SF
LPS-47470 Sort
LPS-47470 Let's remove the static constants, doesn't help much anyways
LPS-47470 Just return companyId
LPS-47686 SF