Merge r1469556 from trunk:

 * r1469556
   Load hooks env in svn_repos_fs_change_rev_prop4() properly.
   Justification:
     Security issue, possible case where hooks environment doesn't get loaded.
   Votes:
     +1: breser, philip, rhuijben


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

 * r1469871
   Make the conflict prompt correctly localised again.
   Justification:
     Regression from 1.7.  Needed quickly so translators can get their
     translations done.  <http://svn.haxx.se/dev/archive-2013-04/0429.shtml>
   Votes:
     +1: julianfoad, philip, rhuijben


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

 * r1469994
   Make "h" and "?" work at the conflict prompt as promised by the help text.
   Justification:
     User annoyance.
   Votes:
     +1: julianfoad, philip, rhuijben


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