External file references: Fixed the relocation in the advanced cases
p4#: 21253