[Bug 1054605] Allow package replacement to resolve file conflicts