folder_branch_ops: more @akalin-keybase fixups
folder_branch_ops: more @akalin-keybase fixups

Issue: #617

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