Merge "Enable tempest cleanup with record_resources in jobs"