Merge "Fix tempest cleanup for python3"