Merged revisions 29344,29348 via svnmerge from
https://svn.collab.net/repos/svn/trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/mergeinfo-capability@869425 13f79535-47bb-0310-9956-ffa450edef68