On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905479,
resolving conflicts in depth_tests.py and patch_tests.py.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/pristines-on-demand-on-mwf@1905480 13f79535-47bb-0310-9956-ffa450edef68