Backport of r60743:
Patch #1736: Fix file name handling of _msi.FCICreate.
2 files changed