On the diff-callbacks3 branch, merge outstanding changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/diff-callbacks3@870757 13f79535-47bb-0310-9956-ffa450edef68