updates physical file system, now that files are being disposed of properly we don't need to delete first
Merge remote-tracking branch 'origin/6.2.2' into 7.1.5
fixes merge issue