Issue #3362589 by yash.rode, Wim Leers: Remove BypassedStagerServiceBase reference as the class does not exist anymore
Issue #3323706 by yash.rode: Split up UpdaterFormTest to speed up test runs: from 13.5 to 10.5 minutes