Merge "Fix tempest cleanup AttributeError"