Create r1536931 backport branch

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1536931@1536934 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1518942,1536914,1536931 from trunk, resolving ordering problem in op-depth.c

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1536931@1536935 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1536931 branch: Do a catchup merge from 1.8.x to fix spurious conflicts in the op-depth-test.c file.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1536931@1591144 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1536931 branch: Fix a sprious whitespace change I introduced in r1591144.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_replace_ancestor_with_child): Restore the missing blank line.


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

 * r1518942, r1536914, r1536931
   Fix commit of a specific mixed revision copy with non copy descendants that
   shadow not present nodes. This problem manifests itself as a copy of a tree
   that can't be committed because it is reported out of date.
   Justification:
     'svn cp TREE NEW-TREE; svn ci NEW-TREE' should never report out of date
     on some random descendant.
   Branch: ^/subversion/branches/1.8.x-r1536931
   Votes:
     +1: rhuijben, philip, breser



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