On the 1.8.x-r1594223 branch, merge changes in r1553501, r1553556,
and r1559197 from trunk (resolving some trivial conflicts) to fix
the bug associated with the regression test on this branch.

In addition to the merged changes:

* subversion/tests/cmdline/lock_tests.py
  (delete_locked_file_with_percent): Remove XFail marker.



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