Merge r1480082 from trunk onto 1.8.x: error string fixes.

Approved by: breser

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