Merge r1468347 from trunk:

 * r1468347
   Handle POST errors like MKACTIVITY errors.
   Justification:
     Consistent error reporting for v1 and v2 protocols.
   Votes:
     +1: philip, rhuijben, brane


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

 * r1468565
   Use correct plural localisation for conflict summary messages.
   Justification:
     Required for several translations.
   Votes:
     +1: philip, brane, rhuijben
     +1 (non-binding): mattiase


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

 * r1469248
   Install mod_dontdothat with install-tools into $(APACHE_LIBEXECDIR).
   Justification:
     Fixes issue #4338 which is a 1.8 blocker.
     See: http://subversion.tigris.org/issues/show_bug.cgi?id=4338
   Votes:
     +1: brane, rhuijben, philip


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