Merge r1551579 from trunk, removing testcase changes and fixing text conflict

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