Backport r1481010 to 1.7 resolving both a tree-conflict due to a
renamed file (move, merge, move-back) and a text-conflict.


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