Set the log_name for individual unit tests.

This is to be able to easier tell the difference between the output
of individual test cases.
ProtocolExpired is not defer.CancelledError. That was a confusion
of conceprts, fix that.
Merge branch 'master' into release-0.29.x
Fix resolving couchdb-conflicts alert when there is no conflicts in database.
Use coiteration when solving conflicts in integrity agent.

This is to prevent it from taking too much reactor time.
Fix counting deleted update logs.