Make bb gh merge more robust



Pull request for [Make bb gh merge more robust](https://trello.com/c/lqaQ4SO1/1927-make-bb-gh-merge-more-robust).