Issue #3248527: Clean up Updater

Adam G-H requested to merge issue/automatic_updates-3248527:3248527-clean-up-updater into 8.x-2.x Nov 09, 2021