[TECHNICAL SUPPORT] LPS-34437 Fixed DuplicateFileExecption during import

Hi Sergio,

Based on our conversation I resend #783 in this PR as the blocking issue: http://issues.liferay.com/browse/LPS-35073 is no longer reproducible.

I've rebased this PR so the tests shouldn't fail now.

Regards,
Vilmos