Merge the r1541638 group from trunk:

 * r1541638, r1545302
   Fix automatic relocate during update for working copies that are
   not at repository root.
   Justification:
     Makes it much easier on users when their hoster migrates from http
     to https. (Too bad that there is no way to safely transfer credentials..)
   Votes:
     +1: rhuijben, philip, ivan


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1563372 13f79535-47bb-0310-9956-ffa450edef68