Merge pull request #1913 from bradking/windows-remove

Restore toleration of missing to-be-deleted files on Windows