Merge "PROD-23889 - cleanup stage should look for files, not directories"