Do not rename files unexpectedly when changing the URL

This is the real fix now - note that the last commit
4de9a233 was actually the fix for bug
320823. Somehow, I have messed up the local branches in my git
respository clone - sorry for the confusion!

BUG: 319912
FIXED-IN: 4.10.5
REVIEW: 110908