1079511 - better relative url collision prevention
Merge pull request #1297 from asmacdo/1079511

1079511 - better relative url collision prevention