Merge r1579588 from trunk, accounting for lock code refactoring

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