LPS-47470 Clean service keys from archived setups when upgrading

This pull depends on #19245 and includes its commits as well. /cc @izaera