depth_tests 37, 38 failing on Windows

From the latest run of the Windows buildbot:

At least one test FAILED, checking M:\svn-auto-test\fsfs\tests.log
FAIL: depth_tests.py 37: tree conflicts resolved depth-immediates

FAIL: depth_tests.py 38: tree conflicts resolved depth-infinity

07:03 AM

I think that these tests started failing after r34345, but that was obscured by
that fact that there were a bunch of other tests failing on that buildbot at the
same time. I've since fixed those failures, but could a tree-conflicts-minded
person take a look at the two depth tests above?

Thanks,
-Hyrum