folder_branch_ops: @akalin's suggested fixups
folder_branch_ops: @akalin's suggested fixups

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