cr: clean up block state after failed resolution
cr: clean up block state after failed resolution

Issue: KBFS-1133
Issue: KBFS-921

keybase/client,keybase/client,keybase/client,keybase/client,keybase/kbfs,keybase/client,keybase/client,keybase/client,keybase/client,keybase/kbfs,keybase/kbfs,keybase/client,keybase/client,keybase/client,keybase/client,keybase/kbfs