On the 'shelve-checkpoint3' branch: catch up with ^/subversion/branches/shelve@1813857.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/shelve-checkpoint3@1813858 13f79535-47bb-0310-9956-ffa450edef68