On the 1.7.x branch: Commit mergeinfo changes which should have been part
of r1667487.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667490 13f79535-47bb-0310-9956-ffa450edef68