Revision 1884591

Merge the r1878997 group from trunk:

 * r1878997, r1879192, r1879474, r1879959
   Fix issue #4859, Merge removing a folder with non-inheritable mergeinfo
   -> E155023: can't set properties: invalid status for updating properties
   Justification:
     Annoying failure, encountered in real use.
   Votes:
     +1: julianfoad, hartmannathan, jcorvel