Do a --record-only merge of -r31357:34104 from trunk so this branch will
reintegrate back to trunk cleanly.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-2843-dev@874181 13f79535-47bb-0310-9956-ffa450edef68