Commit 57aa7b60fd caused catz/setup.sh to no longer call clean.sh, which results in the catz system test failing on subsequent runs if the first run is interrupted or fails. (cherry picked from commit 344d05063f)
344d05063f