deal well with deleted branches in rebuildstaging

save up all the errors about branches that aren't found
until all branches have been scanned and then
report them all, alongside the merge conflict
Merge pull request #3538 from dimagi/delete-branch-ok

deal well with deleted branches in rebuildstaging