Sync from the multi-wc-format up to r1845487.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/better-pristines@1845488 13f79535-47bb-0310-9956-ffa450edef68