Merge "Fix snapshot manage Tempest test"