Merge "Improve tempest-cleanup ansible role"