Revert "Switches to master role in a separate thread"

This reverts commit 48d226980799ee3ef6c6e7b2fa5e1af32e55b20a.

Reason is that this will allow for out-of-order masterIsAvailable events
to be sent, which at least messes up some tests, and perhaps semantically
will introduce other problems. Reverting to think a bit more about it.
Revert "Uses individual directories for forensics purposes"

This reverts commit 0068bb559a270eae6eecbc902e6936986d0dda83.

since #48d226980799ee3ef6c6e7b2fa5e1af32e55b20a was reverted by
revert-commit #e9f300204a449ef699ad85acdc5f6f389ae0d3b9