Bug 872238 - After CreateUnique(), append file leaf name to dsf.mPath, not dsf.mFile.mPath, r=dhylands

This is a followup to bug 858416.