Resolve restore conflicts and tighten smoke cleanup - #2

Resolve restore conflicts and tighten smoke cleanup#2

ivankuznetsov wants to merge 2 commits into

code-monger-givenall:agent/restore-mark-spam-refreshcode-monger-givenall/hey-cli:agent/restore-mark-spam-refreshfrom

ivankuznetsov:fix/restore-conflictsivankuznetsov/hey-cli:fix/restore-conflictsCopy head branch name to clipboard