On the 1.8.x branch:

* .
  Revert accidental mergeinfo only change committed in r1555515,
  which represents a record only merge of a nominated change.


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