Merge "Make FindOrphanedFiles handle files with ! properly"