Merge r1476359 from trunk:

 * r1476359
   JavaHL thread safety bug.
   Justification:
     Unexpected exceptions can be thrown when thread issues are encountered.
   Votes:
     +1: markphip, philip, brane


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

 * r1476193
   Reset SQLite statements on error during 1.7 to 1.8 upgrade.
   Justification:
     Avoid SQLITE_MISUSE errors.
   Votes:
     +1: philip, cmpilato, brane


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

 * r1476607
   Some svnadmin command help copy-editing.
   Justification:
     For users, consistency; for translators, fewer mismatches.
   Votes:
     +1 (non-binding): mattiase
     +1: danielsh, cmpilato, julianfoad


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

 * r1477359
   Fix broken localisation of a string.
   Justification:
     Allows string to be localised. Fewer translation file mismatches.
   Votes:
     +1 (non-binding): mattiase
     +1: danielsh, philip, julianfoad


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