Revert "Switch locking strategy"

This reverts commit eeda98f402ee0668efbc0d7b6fba38c928a2c3bd.

Change-Id: Id4ca2d5922f150b401b403f30985d807fa12db8b
Switch the locking strategy

Use an additional lock instead of a temporary queue.

Change-Id: I96cb88e6dc6f101505bfdeeb40628cd91cf61276
Revert "Revert gratuitous variable rename"

This reverts commit 950a754b0f596873a53c808ed9202be056470870.

We do want the change, but elsewhere.
Revert "Revert unrelated change"

This reverts commit be1009c94b000c90ad7f4f95f370538b9603e807.

We do want the change, but elsewhere.
Revert "Revert reordering of daemon() from the "no softsig" commit"

This reverts commit 5dc8e03dfa2bd55f08295a09c3f0db940f26866f.

I guess we can take this, though it's not really clear why it would matter.
If we do, put it in the generic "reorder startup" commit.