building release
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.
Convert big iterations in cleanup_update_logs() call to use coiterators.

This should make the whole thing more responsive when having lots of them.
build second release
Merge remote-tracking branch 'github/release-0.29.x'
release 0.29.6