Merge "Improve logging in tempest cleanup"