Merge "Fix tempest cleanup command"