Merge the r1520529 group from trunk:

 * r1520529, r1520532, r1520539
   Properly re-canonicalize urls read from xml based entries files.
   Justification:
     The canonicalization rules have been changed since 1.3 and while
     we fixed the newer entries file parsing we forgot the xml based
     entries.  Fixes a client assert.
   Votes:
     +1: rhuijben, philip, stefan2


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