On the 'pristine-checksum-kind' branch: Sync with trunk@1922344.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/pristine-checksum-kind@1922345 13f79535-47bb-0310-9956-ffa450edef68