Merged revisions
29261-29262,29267-29271,29273,29277,29280-29281,29284,29287-29288,29298,29304
via svnmerge from https://svn.collab.net/repos/svn/trunk


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