Port r15359 and r15423 from trunk to the 1.2.x line.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.2.x-get-locks@855512 13f79535-47bb-0310-9956-ffa450edef68
2 files changed