Merge branch 'jn/t9010-work-around-broken-svnadmin' into next