Trying to make more tolerant of directories that exist, at the cost of ignoring massive inode exhaustion errors
Merge ../sgdev2