On branches/svnsync-obliterate: merge changes from trunk up to r39404.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/svnsync-obliterate@879483 13f79535-47bb-0310-9956-ffa450edef68