[az] handle merger rebase

Author: Sploder12

tests/test_base_virtual_machine.cpp

@@ -256,7 +256,6 @@ struct BaseVM : public Test
     mpt::MockSSHTestFixture mock_ssh_test_fixture;
     const mpt::DummyKeyProvider key_provider{"keeper of the seven keys"};
     NiceMock<MockBaseVirtualMachine> vm{"mock-vm", key_provider, zone};
-    mpt::StubAvailabilityZone zone{};
     std::vector<std::shared_ptr<mpt::MockSnapshot>> snapshot_album;
     QString head_path = vm.tmp_dir->filePath(head_filename);
     QString count_path = vm.tmp_dir->filePath(count_filename);

tests/test_daemon.cpp

@@ -121,8 +121,6 @@ struct Daemon : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_platform, remove_alias_script(_)).WillRepeatedly(Return());
         EXPECT_CALL(mock_platform, setup_permission_inheritance(_)).Times(AnyNumber()).WillRepeatedly(Return());
         EXPECT_CALL(mock_platform, bridge_nomenclature).Times(AnyNumber()).WillRepeatedly(Return("notabridge"));
-
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     void SetUp() override