On 1.8.x-r1513879 branch, merge r1513879 and r1513880, resolve
tree conflict on renamed file by renaming before and after merge.


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