Merge proposals dependent on lp:~boiko/history-service/fix_daemon_recover

lp:~boiko/history-service/fix_daemon_recover has no merge proposals.