Merge r1352031 to 1.7.x-r1352031 branch while dealing with the conflict.



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