Merge r1580626 from trunk, resolve duplicate add conflict in op-depth-tests.c

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