Reapplying Aleksandrs dtr_test_fix to master after the cleanup of the wrongly merged dev-controldir

After reverting !1145 (merged) (related also to !1448 (merged), has same merge commit hash dee5650a for some strange reason) the actual fix that !1448 (merged) was supposed to include got reverted too.

What I think must have happened is that the dtr_test_fix was created with next as parent branch, and therefore the dev-controldir changes were also included in the merge.